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

gpu: nvgpu: unit: Shuffle the paths of tests around a bit

Browse Source 
We will need to organize the unit tests in order to keep the
units/ directory managable.

The basic idea here is to mirror the common/ structure in
nvgpu proper under units/. There's one additrion at the
moment though: posix. This is for posix environment related
tests.

Also added a fix for the runlist unit test. Add it to the
tmake sources and move the nvgpu-runlist/ directory to just
runlist/.

Change-Id: I1f4163d0e33c3af70376cfeb3441d277d559e05a
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1935710
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Alex Waterman
2018-10-25 12:48:18 -07:00
committed by mobile promotions
parent 1023c6af14
commit 63da5366a6
31 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.umbrella.tmk
View File

@@ -22,12 +22,13 @@ NV_REPOSITORY_COMPONENTS :=
ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_INTEGRITY),1) ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_INTEGRITY),1)
NV_REPOSITORY_COMPONENTS := drivers/gpu/nvgpu NV_REPOSITORY_COMPONENTS := drivers/gpu/nvgpu
NV_REPOSITORY_COMPONENTS += userspace NV_REPOSITORY_COMPONENTS += userspace
NV_REPOSITORY_COMPONENTS += userspace/units/posix-bitops NV_REPOSITORY_COMPONENTS += userspace/units/posix/bitops
NV_REPOSITORY_COMPONENTS += userspace/units/posix-env NV_REPOSITORY_COMPONENTS += userspace/units/posix/env
NV_REPOSITORY_COMPONENTS += userspace/units/posix-mockio NV_REPOSITORY_COMPONENTS += userspace/units/posix/mockio
NV_REPOSITORY_COMPONENTS += userspace/units/posix-fault-injection NV_REPOSITORY_COMPONENTS += userspace/units/posix/fault-injection
NV_REPOSITORY_COMPONENTS += userspace/units/nvgpu-pramin NV_REPOSITORY_COMPONENTS += userspace/units/pramin
NV_REPOSITORY_COMPONENTS += userspace/units/mm/nvgpu_allocator NV_REPOSITORY_COMPONENTS += userspace/units/mm/nvgpu_allocator
NV_REPOSITORY_COMPONENTS += userspace/units/fifo/runlist
endif endif
# Local Variables: # Local Variables:

4
drivers/gpu/nvgpu/libnvgpu-drv.export
View File

@@ -15,6 +15,8 @@ find_first_bit
find_first_zero_bit find_first_zero_bit
find_next_bit find_next_bit
gk20a_bus_set_bar0_window gk20a_bus_set_bar0_window
gk20a_get_ch_runlist_entry
gk20a_get_tsg_runlist_entry
nvgpu_alloc nvgpu_alloc
nvgpu_alloc_base nvgpu_alloc_base
nvgpu_alloc_common_init nvgpu_alloc_common_init
@@ -60,6 +62,8 @@ nvgpu_pramin_memset
nvgpu_pramin_rd_n nvgpu_pramin_rd_n
nvgpu_pramin_wr_n nvgpu_pramin_wr_n
nvgpu_readl nvgpu_readl
nvgpu_runlist_construct_locked
nvgpu_rwsem_init
nvgpu_sgt_create_from_mem nvgpu_sgt_create_from_mem
nvgpu_usermode_writel nvgpu_usermode_writel
nvgpu_writel nvgpu_writel

12
userspace/Makefile.sources
View File

@@ -47,13 +47,13 @@ CORE_HEADERS := \
# Each directory under the UNIT_SRC directory should correspond to one module. # Each directory under the UNIT_SRC directory should correspond to one module.
UNITS := \ UNITS := \
$(UNIT_SRC)/posix-env \ $(UNIT_SRC)/posix/env \
$(UNIT_SRC)/posix-bitops \ $(UNIT_SRC)/posix/bitops \
$(UNIT_SRC)/posix-mockio \ $(UNIT_SRC)/posix/mockio \
$(UNIT_SRC)/posix-fault-injection \ $(UNIT_SRC)/posix/fault-injection \
$(UNIT_SRC)/nvgpu-pramin \ $(UNIT_SRC)/pramin \
$(UNIT_SRC)/mm/nvgpu_allocator \ $(UNIT_SRC)/mm/nvgpu_allocator \
$(UNIT_SRC)/fifo/nvgpu-runlist \ $(UNIT_SRC)/fifo/runlist \
$(UNIT_SRC)/list $(UNIT_SRC)/list
# A test unit. Not really needed any more... # A test unit. Not really needed any more...

0
userspace/units/fifo/nvgpu-runlist/Makefile → userspace/units/fifo/runlist/Makefile
View File

0
userspace/units/fifo/nvgpu-runlist/Makefile.interface.tmk → userspace/units/fifo/runlist/Makefile.interface.tmk
View File

0
userspace/units/fifo/nvgpu-runlist/Makefile.tmk → userspace/units/fifo/runlist/Makefile.tmk
View File

0
userspace/units/fifo/nvgpu-runlist/nvgpu-runlist.c → userspace/units/fifo/runlist/nvgpu-runlist.c
View File

2
userspace/units/posix-bitops/Makefile → userspace/units/posix/bitops/Makefile
View File

@@ -23,4 +23,4 @@
OBJS = posix-bitops.o OBJS = posix-bitops.o
MODULE = posix-bitops MODULE = posix-bitops
include ../Makefile.units include ../../Makefile.units

2
userspace/units/posix-bitops/Makefile.interface.tmk → userspace/units/posix/bitops/Makefile.interface.tmk
View File

@@ -14,7 +14,7 @@
NVGPU_UNIT_NAME=posix-bitops NVGPU_UNIT_NAME=posix-bitops
include $(NV_COMPONENT_DIR)/../Makefile.units.common.interface.tmk include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk
# Local Variables: # Local Variables:
# indent-tabs-mode: t # indent-tabs-mode: t

2
userspace/units/posix-bitops/Makefile.tmk → userspace/units/posix/bitops/Makefile.tmk
View File

@@ -14,7 +14,7 @@
NVGPU_UNIT_NAME=posix-bitops NVGPU_UNIT_NAME=posix-bitops
include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk
# Local Variables: # Local Variables:
# indent-tabs-mode: t # indent-tabs-mode: t

0
userspace/units/posix-bitops/posix-bitops.c → userspace/units/posix/bitops/posix-bitops.c
View File

2
userspace/units/posix-env/Makefile → userspace/units/posix/env/Makefile vendored
View File

@@ -23,4 +23,4 @@
OBJS = posix-env.o OBJS = posix-env.o
MODULE = posix-env MODULE = posix-env
include ../Makefile.units include ../../Makefile.units

2
userspace/units/posix-env/Makefile.interface.tmk → userspace/units/posix/env/Makefile.interface.tmk vendored
View File

@@ -14,7 +14,7 @@
NVGPU_UNIT_NAME=posix-env NVGPU_UNIT_NAME=posix-env
include $(NV_COMPONENT_DIR)/../Makefile.units.common.interface.tmk include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk
# Local Variables: # Local Variables:
# indent-tabs-mode: t # indent-tabs-mode: t

2
userspace/units/posix-env/Makefile.tmk → userspace/units/posix/env/Makefile.tmk vendored
View File

@@ -14,7 +14,7 @@
NVGPU_UNIT_NAME=posix-env NVGPU_UNIT_NAME=posix-env
include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk
# Local Variables: # Local Variables:
# indent-tabs-mode: t # indent-tabs-mode: t

0
userspace/units/posix-env/posix-env.c → userspace/units/posix/env/posix-env.c vendored
View File

2
userspace/units/posix-fault-injection/Makefile → userspace/units/posix/fault-injection/Makefile
View File

@@ -25,4 +25,4 @@ OBJS = posix-fault-injection.o \
posix-fault-injection-dma-alloc.o posix-fault-injection-dma-alloc.o
MODULE = posix-fault-injection MODULE = posix-fault-injection
include ../Makefile.units include ../../Makefile.units

2
userspace/units/posix-fault-injection/Makefile.interface.tmk → userspace/units/posix/fault-injection/Makefile.interface.tmk
View File

@@ -14,7 +14,7 @@
NVGPU_UNIT_NAME=posix-fault-injection NVGPU_UNIT_NAME=posix-fault-injection
include $(NV_COMPONENT_DIR)/../Makefile.units.common.interface.tmk include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk
# Local Variables: # Local Variables:
# indent-tabs-mode: t # indent-tabs-mode: t

2
userspace/units/posix-fault-injection/Makefile.tmk → userspace/units/posix/fault-injection/Makefile.tmk
View File

@@ -17,7 +17,7 @@ NVGPU_UNIT_SRCS=posix-fault-injection.c \
posix-fault-injection-kmem.c \ posix-fault-injection-kmem.c \
posix-fault-injection-dma-alloc.c posix-fault-injection-dma-alloc.c
include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk
# Local Variables: # Local Variables:
# indent-tabs-mode: t # indent-tabs-mode: t

1
userspace/units/posix-fault-injection/posix-fault-injection-dma-alloc.c → userspace/units/posix/fault-injection/posix-fault-injection-dma-alloc.c
View File

@@ -26,6 +26,7 @@
#include <nvgpu/dma.h> #include <nvgpu/dma.h>
#include <nvgpu/nvgpu_mem.h> #include <nvgpu/nvgpu_mem.h>
#include <nvgpu/posix/posix-fault-injection.h> #include <nvgpu/posix/posix-fault-injection.h>
#include "posix-fault-injection-dma-alloc.h" #include "posix-fault-injection-dma-alloc.h"
#define TEST_DEFAULT_SIZE 4096 #define TEST_DEFAULT_SIZE 4096

0
userspace/units/posix-fault-injection/posix-fault-injection-dma-alloc.h → userspace/units/posix/fault-injection/posix-fault-injection-dma-alloc.h
View File

0
userspace/units/posix-fault-injection/posix-fault-injection-kmem.c → userspace/units/posix/fault-injection/posix-fault-injection-kmem.c
View File

0
userspace/units/posix-fault-injection/posix-fault-injection-kmem.h → userspace/units/posix/fault-injection/posix-fault-injection-kmem.h
View File

0
userspace/units/posix-fault-injection/posix-fault-injection.c → userspace/units/posix/fault-injection/posix-fault-injection.c
View File

2
userspace/units/posix-mockio/Makefile → userspace/units/posix/mockio/Makefile
View File

@@ -23,4 +23,4 @@
OBJS = posix-mockio.o OBJS = posix-mockio.o
MODULE = posix-mockio MODULE = posix-mockio
include ../Makefile.units include ../../Makefile.units

2
userspace/units/posix-mockio/Makefile.interface.tmk → userspace/units/posix/mockio/Makefile.interface.tmk
View File

@@ -14,7 +14,7 @@
NVGPU_UNIT_NAME=posix-mockio NVGPU_UNIT_NAME=posix-mockio
include $(NV_COMPONENT_DIR)/../Makefile.units.common.interface.tmk include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk
# Local Variables: # Local Variables:
# indent-tabs-mode: t # indent-tabs-mode: t

2
userspace/units/posix-mockio/Makefile.tmk → userspace/units/posix/mockio/Makefile.tmk
View File

@@ -14,7 +14,7 @@
NVGPU_UNIT_NAME=posix-mockio NVGPU_UNIT_NAME=posix-mockio
include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk
# Local Variables: # Local Variables:
# indent-tabs-mode: t # indent-tabs-mode: t

0
userspace/units/posix-mockio/posix-mockio.c → userspace/units/posix/mockio/posix-mockio.c
View File

0
userspace/units/nvgpu-pramin/Makefile → userspace/units/pramin/Makefile
View File

0
userspace/units/nvgpu-pramin/Makefile.interface.tmk → userspace/units/pramin/Makefile.interface.tmk
View File

0
userspace/units/nvgpu-pramin/Makefile.tmk → userspace/units/pramin/Makefile.tmk
View File

0
userspace/units/nvgpu-pramin/nvgpu-pramin.c → userspace/units/pramin/nvgpu-pramin.c
View File