From 46067384ba229ed4c62ae338140fc1ab199d6c86 Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Tue, 9 Jul 2019 09:40:36 -0400 Subject: [PATCH] gpu: nvgpu: unit: libnvgpu-fifo for tmake makefiles channel and tsg units used to build object files from upper fifo directory. But this was causing build dependencies issues and stale .o files could be used. Fixed this by building a shared library for nvgpu-fifo for tmake makefiles. Jira NVGPU-3480 Change-Id: I52c9e32b110c560fd445b8c854801f270364953d Signed-off-by: Thomas Fleury Reviewed-on: https://git-master.nvidia.com/r/2151815 GVS: Gerrit_Virtual_Submit Reviewed-by: Ajesh K V Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: mobile promotions Tested-by: mobile promotions --- Makefile.umbrella.tmk | 1 + userspace/units/fifo/Makefile.interface.tmk | 29 +++++++++++++++++++++ userspace/units/fifo/Makefile.tmk | 26 ++++++++++++++++++ userspace/units/fifo/channel/Makefile.tmk | 8 +++--- userspace/units/fifo/libnvgpu-fifo.export | 27 +++++++++++++++++++ userspace/units/fifo/tsg/Makefile.tmk | 9 ++++--- 6 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 userspace/units/fifo/Makefile.interface.tmk create mode 100644 userspace/units/fifo/Makefile.tmk create mode 100644 userspace/units/fifo/libnvgpu-fifo.export diff --git a/Makefile.umbrella.tmk b/Makefile.umbrella.tmk index b94d88985..205fbde7e 100644 --- a/Makefile.umbrella.tmk +++ b/Makefile.umbrella.tmk @@ -55,6 +55,7 @@ NV_REPOSITORY_COMPONENTS += userspace/units/mm/gmmu/pd_cache NV_REPOSITORY_COMPONENTS += userspace/units/mm/gmmu/page_table NV_REPOSITORY_COMPONENTS += userspace/units/mm/page_table_faults NV_REPOSITORY_COMPONENTS += userspace/units/mm/vm +NV_REPOSITORY_COMPONENTS += userspace/units/fifo NV_REPOSITORY_COMPONENTS += userspace/units/fifo/channel NV_REPOSITORY_COMPONENTS += userspace/units/fifo/runlist NV_REPOSITORY_COMPONENTS += userspace/units/fifo/tsg diff --git a/userspace/units/fifo/Makefile.interface.tmk b/userspace/units/fifo/Makefile.interface.tmk new file mode 100644 index 000000000..c9a8a3345 --- /dev/null +++ b/userspace/units/fifo/Makefile.interface.tmk @@ -0,0 +1,29 @@ +################################### tell Emacs this is a -*- makefile-gmake -*- +# +# Copyright (c) 2019, NVIDIA CORPORATION. All Rights Reserved. +# +# NVIDIA CORPORATION and its licensors retain all intellectual property +# and proprietary rights in and to this software, related documentation +# and any modifications thereto. Any use, reproduction, disclosure or +# distribution of this software and related documentation without an express +# license agreement from NVIDIA CORPORATION is strictly prohibited. +# +# tmake for SW Mobile component makefile +# +# libnvgpu-fifo interface makefile fragment +# +############################################################################### + +ifdef NV_INTERFACE_FLAG_SHARED_LIBRARY_SECTION + +NV_INTERFACE_NAME := nvgpu-fifo +NV_INTERFACE_EXPORTS := lib$(NV_INTERFACE_NAME) +NV_INTERFACE_SONAME := lib$(NV_INTERFACE_NAME).so + +endif + +# Local Variables: +# indent-tabs-mode: t +# tab-width: 8 +# End: +# vi: set tabstop=8 noexpandtab: diff --git a/userspace/units/fifo/Makefile.tmk b/userspace/units/fifo/Makefile.tmk new file mode 100644 index 000000000..1740e6723 --- /dev/null +++ b/userspace/units/fifo/Makefile.tmk @@ -0,0 +1,26 @@ +################################### tell Emacs this is a -*- makefile-gmake -*- +# +# Copyright (c) 2019 NVIDIA CORPORATION. All Rights Reserved. +# +# NVIDIA CORPORATION and its licensors retain all intellectual property +# and proprietary rights in and to this software, related documentation +# and any modifications thereto. Any use, reproduction, disclosure or +# distribution of this software and related documentation without an express +# license agreement from NVIDIA CORPORATION is strictly prohibited. +# +# tmake for SW Mobile component makefile +# +# Component makefile for compiling nvgpu-fifo common tests. +# +############################################################################### + +NVGPU_UNIT_NAME = nvgpu-fifo +NVGPU_UNIT_SRCS = nvgpu-fifo.c nvgpu-fifo-gv11b.c + +include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk + +# Local Variables: +# indent-tabs-mode: t +# tab-width: 8 +# End: +# vi: set tabstop=8 noexpandtab: diff --git a/userspace/units/fifo/channel/Makefile.tmk b/userspace/units/fifo/channel/Makefile.tmk index 01450e754..2d1d9f8f2 100644 --- a/userspace/units/fifo/channel/Makefile.tmk +++ b/userspace/units/fifo/channel/Makefile.tmk @@ -25,9 +25,11 @@ ############################################################################### NVGPU_UNIT_NAME = nvgpu-channel -NVGPU_UNIT_SRCS = nvgpu-channel.c \ - ../nvgpu-fifo.c \ - ../nvgpu-fifo-gv11b.c +NVGPU_UNIT_SRCS = nvgpu-channel.c + +NVGPU_UNIT_INTERFACE_DIRS := \ + $(NV_COMPONENT_DIR)/.. \ + $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk diff --git a/userspace/units/fifo/libnvgpu-fifo.export b/userspace/units/fifo/libnvgpu-fifo.export new file mode 100644 index 000000000..4fd5a6d6a --- /dev/null +++ b/userspace/units/fifo/libnvgpu-fifo.export @@ -0,0 +1,27 @@ +# +# Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +test_fifo_init_support +test_fifo_remove_support +test_fifo_subtest_pruned +test_fifo_flags_str + diff --git a/userspace/units/fifo/tsg/Makefile.tmk b/userspace/units/fifo/tsg/Makefile.tmk index 521c9c82f..f8623f91b 100644 --- a/userspace/units/fifo/tsg/Makefile.tmk +++ b/userspace/units/fifo/tsg/Makefile.tmk @@ -25,10 +25,11 @@ ############################################################################### NVGPU_UNIT_NAME = nvgpu-tsg -NVGPU_UNIT_SRCS = \ - nvgpu-tsg.c \ - ../nvgpu-fifo.c \ - ../nvgpu-fifo-gv11b.c +NVGPU_UNIT_SRCS = nvgpu-tsg.c + +NVGPU_UNIT_INTERFACE_DIRS := \ + $(NV_COMPONENT_DIR)/.. \ + $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk