From 8e8e40e66db5a4865efc6d06626f93bcf2a2b24e Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 2 Jan 2019 12:20:25 -0800 Subject: [PATCH] gpu: nvgpu: Adjust MM unit test paths Adjust the MM unit tests pd_cache and page_table to reflect their new paths in the common nvgpu code. JIRA NVGPU-1246 Change-Id: I01454f758bbf54864210c01f8bfe3750b26891ce Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1986121 Reviewed-by: Nicolas Benech Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- Makefile.umbrella.tmk | 4 ++-- userspace/Makefile.sources | 4 ++-- userspace/units/mm/{ => gmmu}/page_table/Makefile | 2 +- .../units/mm/{ => gmmu}/page_table/Makefile.interface.tmk | 2 +- userspace/units/mm/{ => gmmu}/page_table/Makefile.tmk | 2 +- userspace/units/mm/{ => gmmu}/page_table/page_table.c | 0 userspace/units/mm/{ => gmmu}/pd_cache/Makefile | 2 +- userspace/units/mm/{ => gmmu}/pd_cache/Makefile.interface.tmk | 2 +- userspace/units/mm/{ => gmmu}/pd_cache/Makefile.tmk | 2 +- userspace/units/mm/{ => gmmu}/pd_cache/pd_cache.c | 0 10 files changed, 10 insertions(+), 10 deletions(-) rename userspace/units/mm/{ => gmmu}/page_table/Makefile (97%) rename userspace/units/mm/{ => gmmu}/page_table/Makefile.interface.tmk (91%) rename userspace/units/mm/{ => gmmu}/page_table/Makefile.tmk (92%) rename userspace/units/mm/{ => gmmu}/page_table/page_table.c (100%) rename userspace/units/mm/{ => gmmu}/pd_cache/Makefile (97%) rename userspace/units/mm/{ => gmmu}/pd_cache/Makefile.interface.tmk (91%) rename userspace/units/mm/{ => gmmu}/pd_cache/Makefile.tmk (92%) rename userspace/units/mm/{ => gmmu}/pd_cache/pd_cache.c (100%) diff --git a/Makefile.umbrella.tmk b/Makefile.umbrella.tmk index 799372f18..c98bcac56 100644 --- a/Makefile.umbrella.tmk +++ b/Makefile.umbrella.tmk @@ -29,8 +29,8 @@ NV_REPOSITORY_COMPONENTS += userspace/units/posix/fault-injection NV_REPOSITORY_COMPONENTS += userspace/units/pramin NV_REPOSITORY_COMPONENTS += userspace/units/mm/nvgpu_allocator NV_REPOSITORY_COMPONENTS += userspace/units/mm/nvgpu_sgt -NV_REPOSITORY_COMPONENTS += userspace/units/mm/pd_cache -NV_REPOSITORY_COMPONENTS += userspace/units/mm/page_table +NV_REPOSITORY_COMPONENTS += userspace/units/mm/gmmu/pd_cache +NV_REPOSITORY_COMPONENTS += userspace/units/mm/gmmu/page_table NV_REPOSITORY_COMPONENTS += userspace/units/fifo/runlist NV_REPOSITORY_COMPONENTS += userspace/units/fuse NV_REPOSITORY_COMPONENTS += userspace/units/list diff --git a/userspace/Makefile.sources b/userspace/Makefile.sources index fb15955cb..8ab0fe76a 100644 --- a/userspace/Makefile.sources +++ b/userspace/Makefile.sources @@ -55,8 +55,8 @@ UNITS := \ $(UNIT_SRC)/fuse \ $(UNIT_SRC)/mm/nvgpu_allocator \ $(UNIT_SRC)/mm/nvgpu_sgt \ - $(UNIT_SRC)/mm/pd_cache \ - $(UNIT_SRC)/mm/page_table \ + $(UNIT_SRC)/mm/gmmu/pd_cache \ + $(UNIT_SRC)/mm/gmmu/page_table \ $(UNIT_SRC)/fifo/runlist \ $(UNIT_SRC)/list diff --git a/userspace/units/mm/page_table/Makefile b/userspace/units/mm/gmmu/page_table/Makefile similarity index 97% rename from userspace/units/mm/page_table/Makefile rename to userspace/units/mm/gmmu/page_table/Makefile index 158decace..dc546de99 100644 --- a/userspace/units/mm/page_table/Makefile +++ b/userspace/units/mm/gmmu/page_table/Makefile @@ -23,4 +23,4 @@ OBJS = page_table.o MODULE = page_table -include ../../Makefile.units +include ../../../Makefile.units diff --git a/userspace/units/mm/page_table/Makefile.interface.tmk b/userspace/units/mm/gmmu/page_table/Makefile.interface.tmk similarity index 91% rename from userspace/units/mm/page_table/Makefile.interface.tmk rename to userspace/units/mm/gmmu/page_table/Makefile.interface.tmk index 3991ba430..6f9e19432 100644 --- a/userspace/units/mm/page_table/Makefile.interface.tmk +++ b/userspace/units/mm/gmmu/page_table/Makefile.interface.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=page_table -include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk +include $(NV_COMPONENT_DIR)/../../../Makefile.units.common.interface.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/mm/page_table/Makefile.tmk b/userspace/units/mm/gmmu/page_table/Makefile.tmk similarity index 92% rename from userspace/units/mm/page_table/Makefile.tmk rename to userspace/units/mm/gmmu/page_table/Makefile.tmk index b67af294d..fc3f524da 100644 --- a/userspace/units/mm/page_table/Makefile.tmk +++ b/userspace/units/mm/gmmu/page_table/Makefile.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=page_table -include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk +include $(NV_COMPONENT_DIR)/../../../Makefile.units.common.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/mm/page_table/page_table.c b/userspace/units/mm/gmmu/page_table/page_table.c similarity index 100% rename from userspace/units/mm/page_table/page_table.c rename to userspace/units/mm/gmmu/page_table/page_table.c diff --git a/userspace/units/mm/pd_cache/Makefile b/userspace/units/mm/gmmu/pd_cache/Makefile similarity index 97% rename from userspace/units/mm/pd_cache/Makefile rename to userspace/units/mm/gmmu/pd_cache/Makefile index 2245ebff1..413ace98a 100644 --- a/userspace/units/mm/pd_cache/Makefile +++ b/userspace/units/mm/gmmu/pd_cache/Makefile @@ -23,4 +23,4 @@ OBJS = pd_cache.o MODULE = pd_cache -include ../../Makefile.units +include ../../../Makefile.units diff --git a/userspace/units/mm/pd_cache/Makefile.interface.tmk b/userspace/units/mm/gmmu/pd_cache/Makefile.interface.tmk similarity index 91% rename from userspace/units/mm/pd_cache/Makefile.interface.tmk rename to userspace/units/mm/gmmu/pd_cache/Makefile.interface.tmk index afef36fd9..13565de8a 100644 --- a/userspace/units/mm/pd_cache/Makefile.interface.tmk +++ b/userspace/units/mm/gmmu/pd_cache/Makefile.interface.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=pd_cache -include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk +include $(NV_COMPONENT_DIR)/../../../Makefile.units.common.interface.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/mm/pd_cache/Makefile.tmk b/userspace/units/mm/gmmu/pd_cache/Makefile.tmk similarity index 92% rename from userspace/units/mm/pd_cache/Makefile.tmk rename to userspace/units/mm/gmmu/pd_cache/Makefile.tmk index f1f6e2b42..2f72a3f10 100644 --- a/userspace/units/mm/pd_cache/Makefile.tmk +++ b/userspace/units/mm/gmmu/pd_cache/Makefile.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=pd_cache -include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk +include $(NV_COMPONENT_DIR)/../../../Makefile.units.common.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/mm/pd_cache/pd_cache.c b/userspace/units/mm/gmmu/pd_cache/pd_cache.c similarity index 100% rename from userspace/units/mm/pd_cache/pd_cache.c rename to userspace/units/mm/gmmu/pd_cache/pd_cache.c