gpu: nvgpu: build unit tests for safety qnx based on umbrella chosen

Earlier, libnvgpu-drv.so and unit tests were being built with safety
debug profile unconditionally for all qnx and l4t builds.
In order to get coverage numbers corresponding to the release build
let us remove the overriding of the build profile for safety qnx
build. This also needs that these components are built only for
safety qnx and l4t builds.

For x86 and L4T userspace build, default profile is still set to
safety-debug.

JIRA NVGPU-4830

Change-Id: I02f572761bda9eb0c1b8fcdf7b22a07a9d10303a
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2275764
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit

Makefile.umbrella.tmk

@@ -32,6 +32,18 @@
 NV_REPOSITORY_COMPONENTS :=
 
 ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_INTEGRITY),1)
+
+ifeq ($(NV_BUILD_CONFIGURATION_OS_IS_QNX),1)
+ifeq ($(NV_BUILD_CONFIGURATION_IS_SAFETY),1)
+# On QNX, the unit tests are built only for safety profile.
+build_nvgpu_ut := 1
+endif
+else
+# On L4T, the unit tests are built with safety profile forced.
+build_nvgpu_ut := 1
+endif
+
+ifeq ($(build_nvgpu_ut),1)
 NV_REPOSITORY_COMPONENTS := drivers/gpu/nvgpu
 NV_REPOSITORY_COMPONENTS += userspace
 NV_REPOSITORY_COMPONENTS += userspace/units/posix/bitops
@@ -148,6 +160,7 @@ NV_REPOSITORY_COMPONENTS += userspace/units/sync
 NV_REPOSITORY_COMPONENTS += userspace/units/mock-iospace
 NV_REPOSITORY_COMPONENTS += userspace/units/ecc
 endif
+endif
 
 # Local Variables:
 # indent-tabs-mode: t

drivers/gpu/nvgpu/Makefile.tmk

@@ -51,14 +51,14 @@ NV_COMPONENT_INCLUDES		:=				\
 		$(NVGPU_NEXT_SOURCE)/../../../include
 ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_QNX),1)
 NV_COMPONENT_SYSTEM_SHARED_LIBRARIES += pthread
+NVGPU_FORCE_SAFETY_PROFILE	:= 1
+NVGPU_FORCE_DEBUG_PROFILE	:= 1
 endif
 NV_COMPONENT_CFLAGS		+=    \
 	-D__NVGPU_POSIX__             \
 	-DCONFIG_NVGPU_SUPPORT_TURING \
 	-D__NVGPU_UNIT_TEST__
 
-NVGPU_FORCE_SAFETY_PROFILE	:= 1
-NVGPU_FORCE_DEBUG_PROFILE	:= 1
 -include $(NV_COMPONENT_DIR)/Makefile.shared.configs
 NV_COMPONENT_CFLAGS             += $(NVGPU_COMMON_CFLAGS)
 

userspace/Makefile

@@ -70,15 +70,9 @@ CONFIGS := -D__NVGPU_POSIX__ \
 	   -DNVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT \
 	   -D__NVGPU_UNIT_TEST__
 
-# For target "libnvgpu", safety profile should be used
+# safety-debug profile is used by default
-# safety-debug profile is used otherwise
-ifeq ( ,$(findstring libnvgpu, '$(MAKECMDGOALS)'))
-NVGPU_FORCE_DEBUG_PROFILE	:= 1
-else
-NVGPU_FORCE_DEBUG_PROFILE	:= 0
-endif
-
 NVGPU_FORCE_SAFETY_PROFILE	:= 1
+NVGPU_FORCE_DEBUG_PROFILE	:= 1
 include $(NVGPU_SRC)/Makefile.shared.configs
 CONFIGS+=$(NVGPU_COMMON_CFLAGS)
 

userspace/Makefile.tmk

@@ -137,14 +137,14 @@ NV_COMPONENT_INCLUDES		:= \
 ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_QNX),1)
 NV_COMPONENT_SYSTEM_SHARED_LIBRARIES += pthread
 NV_COMPONENT_SYSTEM_SHARED_LIBRARIES += dl
+NVGPU_FORCE_SAFETY_PROFILE	:= 1
+NVGPU_FORCE_DEBUG_PROFILE	:= 1
 endif
 
 NV_COMPONENT_CFLAGS		+= \
 	-D__NVGPU_POSIX__ \
 	-DNVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT
 
-NVGPU_FORCE_SAFETY_PROFILE	:= 1
-NVGPU_FORCE_DEBUG_PROFILE	:= 1
 -include ../drivers/gpu/nvgpu/Makefile.shared.configs
 NV_COMPONENT_CFLAGS             += $(NVGPU_COMMON_CFLAGS)
 

userspace/units/Makefile.units.common.tmk

@@ -56,8 +56,11 @@ endif
 NV_COMPONENT_CFLAGS		+= -D__NVGPU_UNIT_TEST__
 NV_COMPONENT_CFLAGS		+= -DNVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT
 
+ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_QNX),1)
 NVGPU_FORCE_SAFETY_PROFILE	:= 1
 NVGPU_FORCE_DEBUG_PROFILE	:= 1
+endif
+
 -include $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu/Makefile.shared.configs
 NV_COMPONENT_CFLAGS             += $(NVGPU_COMMON_CFLAGS)