nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 09:12:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvgpu: arch: Add YAML compilation check

Browse Source 
Add makefile targets to the tmake nvgpu-drv build to execute the arch.py
script before compiling the driver. This ensures that our source matches
our YAML at all times.

Also add one YAML fix to make sure the arch check actually passes!

JIRA NVGPU-3075

Change-Id: Ic893a26889732ce55ce16b0188da337629921e6b
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2119821
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Philip Elcan <pelcan@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Alex Waterman
2019-05-08 08:23:11 -07:00
committed by mobile promotions
parent 646b08a032
commit e4c63e7b36
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/nvgpu-common.yaml
View File

@@ -13,7 +13,8 @@ nvgpu:
safe: yes safe: yes
owner: Alex W owner: Alex W
sources: [ include/nvgpu/gk20a.h, sources: [ include/nvgpu/gk20a.h,
include/nvgpu/nvgpu_common.h ] include/nvgpu/nvgpu_common.h,
include/nvgpu/secure_ops.h ]
bios: bios:
safe: yes safe: yes

34
drivers/gpu/nvgpu/Makefile.tmk
View File

@@ -15,6 +15,10 @@
ifdef NV_COMPONENT_FLAG_SHARED_LIBRARY_SECTION ifdef NV_COMPONENT_FLAG_SHARED_LIBRARY_SECTION
include $(NV_BUILD_START_COMPONENT) include $(NV_BUILD_START_COMPONENT)
# Architecture script. This validates our YAML architecture against the
# source code we have.
ARCH_PY := $(NV_SOURCE)/core-private/tools/arch/arch.py
# #
# Include the nvgpu-next repo, if it's present. It's expected to be # Include the nvgpu-next repo, if it's present. It's expected to be
# located in the same directory as nvgpu, like so: # located in the same directory as nvgpu, like so:
@@ -32,6 +36,8 @@ NVGPU_NEXT_SOURCE := \
$(NV_COMPONENT_DIR)/../../../../nvgpu-next/drivers/gpu/nvgpu $(NV_COMPONENT_DIR)/../../../../nvgpu-next/drivers/gpu/nvgpu
NVGPU_POSIX := -D__NVGPU_POSIX__ NVGPU_POSIX := -D__NVGPU_POSIX__
NVGPU_ARCH := $(NV_COMPONENT_DIR)/../../../arch
NVGPU_ARCH_YAML := $(NVGPU_ARCH)/*.yaml
NV_COMPONENT_NAME := nvgpu-drv NV_COMPONENT_NAME := nvgpu-drv
NV_COMPONENT_OWN_INTERFACE_DIR := . NV_COMPONENT_OWN_INTERFACE_DIR := .
@@ -74,6 +80,34 @@ NV_COMPONENT_SOURCES := \
$(srcs) \ $(srcs) \
$(addprefix $(NVGPU_NEXT_SOURCE)/,$(srcs_next)) $(addprefix $(NVGPU_NEXT_SOURCE)/,$(srcs_next))
# $(srcs_next) already has the NV_COMPONENT_DIR prefix so we already have the
# absolute path to those files. srcs are all relative, so we have to prefix
# those with the absolute path.
SRC_DEPS := srcs_next
SRC_DEPS += \
$(addprefix $(NV_COMPONENT_DIR)/,$(srcs))
#
# A little bit of magic to get tmake to execute the arch.py python script
# before we build the driver. Currently it ensures that the source code matches
# the arch.
#
# The way this works is we define a special target $(SRC_DEPS) which contains
# each .c file in the driver. Then when each .o target requires the
# corresponding .c file, this target is triggered. It in turn depends on the
# YAML files. Those files, then depend on a phony target (nvgpu-arch) that
# actually executes the check.
#
$(SRC_DEPS): $(NVGPU_ARCH_YAML)
$(NVGPU_ARCH_YAML): nvgpu-arch
nvgpu-arch: $(ARCH_PY)
$(PYTHON2) $(ARCH_PY) \
--arch-file $(NVGPU_ARCH)/nvgpu.yaml \
--source $(NV_COMPONENT_DIR) \
sources --check
.PHONY: nvgpu-arch
NV_COMPONENT_SYSTEMIMAGE_DIR := $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/nvgpu_unit NV_COMPONENT_SYSTEMIMAGE_DIR := $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/nvgpu_unit
systemimage:: $(NV_COMPONENT_SYSTEMIMAGE_DIR) systemimage:: $(NV_COMPONENT_SYSTEMIMAGE_DIR)
$(NV_COMPONENT_SYSTEMIMAGE_DIR) : $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR) $(NV_COMPONENT_SYSTEMIMAGE_DIR) : $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)