Add and update samples with CUDA 10.1 support

2026-10-11 23:38:25 +08:00 · 2019-01-23 01:34:43 +05:30
parent 32f0fc6111
commit b458dafcd6
201 changed files with 9072 additions and 286 deletions
--- a/Samples/simpleVulkan/Build_instructions.txt
+++ b/Samples/simpleVulkan/Build_instructions.txt
@@ -10,9 +10,14 @@ To add the GLFW3 headers path
 -- In Property pages window go to "VC++ Directories" section. Here in "Include Directories" edit and add path to GLFW3 headers include directory location.
 ** Make sure to add path to glfw3.dll in your PATH environment variable**

-
 For Linux:
 -- Install the Vulkan SDK from https://www.lunarg.com/vulkan-sdk/  and follow environment setup instructions.
 -- Install GLFW3 library through your OS package repository. For example: apt-get for Ubuntu and dnf for RHEL/CentOS
 -- Install "libxcb1-dev" and "xorg-dev" as GLFW3 is depended on it
-- Add Vulkan and GLFW3 libraries directories to LD_LIBRARY_PATH
+-- Add Vulkan and GLFW3 libraries directories to LD_LIBRARY_PATH
+
+For Linux aarch64(L4T):
+-- Install GLFW3 library using "apt-get install libglfw3-dev" this will provide glfw3 
+-- install above will also provide libvulkan-dev as dependencies
+-- Add Vulkan and GLFW3 libraries directories to LD_LIBRARY_PATH
+-- Pass path to vulkan sdk while building 'make VULKAN_SDK_PATH=<PATH_TO_VULKAN_SDK>', VULKAN_SDK_PATH in this scenario is typically "/usr"
--- a/Samples/simpleVulkan/Makefile
+++ b/Samples/simpleVulkan/Makefile
@@ -246,9 +246,9 @@ ifeq ($(TARGET_ARCH),armv7l)
  SAMPLE_ENABLED := 0
 endif

-# This sample is not supported on aarch64
-ifeq ($(TARGET_ARCH),aarch64)
-  $(info >>> WARNING - simpleVulkan is not supported on aarch64 - waiving sample <<<)
+# This sample is not supported on QNX
+ifeq ($(TARGET_OS),qnx)
+  $(info >>> WARNING - simpleVulkan is not supported on QNX - waiving sample <<<)
  SAMPLE_ENABLED := 0
 endif

@@ -301,7 +301,11 @@ ifeq ($(TARGET_OS),linux)
 endif

 # Gencode arguments
+ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),armv7l aarch64))
+SMS ?= 30 35 37 50 52 60 61 70 72 75
+else
 SMS ?= 30 35 37 50 52 60 61 70 75
+endif

 ifeq ($(SMS),)
 $(info >>> WARNING - no SM architectures have been specified - waiving sample <<<)
@@ -331,8 +335,6 @@ endif
 all: build

 build: simpleVulkan
-	$(EXEC) $(VULKAN_SDK_PATH)/bin/glslangValidator -V shader_sine.vert
-	$(EXEC) $(VULKAN_SDK_PATH)/bin/glslangValidator -V shader_sine.frag

 check.deps:
 ifeq ($(SAMPLE_ENABLED),0)
@@ -355,7 +357,5 @@ run: build
 clean:
 	rm -f simpleVulkan vulkanCUDASinewave.o
 	rm -rf ../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)/simpleVulkan
-	rm -rf vert.spv
-	rm -rf frag.spv

 clobber: clean
--- a/Samples/simpleVulkan/NsightEclipse.xml
+++ b/Samples/simpleVulkan/NsightEclipse.xml
@@ -38,14 +38,6 @@
  <librarypaths>
  </librarypaths>
  <nsight_eclipse>true</nsight_eclipse>
-  <postbuildevent>
-    <event os="Windows">$(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.vert</event>
-    <event os="Windows">$(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.frag</event>
-    <event os="Linux">$(VULKAN_SDK_PATH)/bin/glslangValidator -V shader_sine.vert</event>
-    <event os="Linux">$(VULKAN_SDK_PATH)/bin/glslangValidator -V shader_sine.frag</event>
-    <eventclean os="Linux">rm -rf vert.spv</eventclean>
-    <eventclean os="Linux">rm -rf frag.spv</eventclean>
-  </postbuildevent>
  <primary_file>vulkanCUDASinewave.cu</primary_file>
  <required_dependencies>
    <dependency>X11</dependency>
@@ -64,6 +56,7 @@
  <sm-arch>sm60</sm-arch>
  <sm-arch>sm61</sm-arch>
  <sm-arch>sm70</sm-arch>
+  <sm-arch>sm72</sm-arch>
  <sm-arch>sm75</sm-arch>
  <supported_envs>
    <env>
@@ -73,6 +66,9 @@
    <env>
      <platform>windows7</platform>
    </env>
+    <env>
+      <platform>aarch64</platform>
+    </env>
  </supported_envs>
  <supported_sm_architectures>
    <include>all</include>
--- a/Samples/simpleVulkan/README.md
+++ b/Samples/simpleVulkan/README.md
@@ -10,7 +10,7 @@ Graphics Interop, CUDA Vulkan Interop, Data Parallel Algorithms

 ## Supported SM Architectures

-[SM 3.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 3.5 ](https://developer.nvidia.com/cuda-gpus)  [SM 3.7 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.2 ](https://developer.nvidia.com/cuda-gpus)  [SM 6.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 6.1 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.5 ](https://developer.nvidia.com/cuda-gpus)
+[SM 3.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 3.5 ](https://developer.nvidia.com/cuda-gpus)  [SM 3.7 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 5.2 ](https://developer.nvidia.com/cuda-gpus)  [SM 6.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 6.1 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.0 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.2 ](https://developer.nvidia.com/cuda-gpus)  [SM 7.5 ](https://developer.nvidia.com/cuda-gpus)

 ## Supported OSes

@@ -18,7 +18,7 @@ Linux, Windows

 ## Supported CPU Architecture

-x86_64
+x86_64, aarch64

 ## CUDA APIs involved

@@ -30,7 +30,7 @@ cudaImportExternalMemory, cudaExternalMemoryGetMappedBuffer, cudaImportExternalS

 ## Prerequisites

-Download and install the [CUDA Toolkit 10.0](https://developer.nvidia.com/cuda-downloads) for your corresponding platform.
+Download and install the [CUDA Toolkit 10.1](https://developer.nvidia.com/cuda-downloads) for your corresponding platform.
 Make sure the dependencies mentioned in [Dependencies]() section above are installed.

 ## Build and Run
@@ -52,9 +52,9 @@ $ cd <sample_dir>
 $ make
 ```
 The samples makefiles can take advantage of certain options:
-*  **TARGET_ARCH=<arch>** - cross-compile targeting a specific architecture. Allowed architectures are x86_64.
+*  **TARGET_ARCH=<arch>** - cross-compile targeting a specific architecture. Allowed architectures are x86_64, aarch64.
    By default, TARGET_ARCH is set to HOST_ARCH. On a x86_64 machine, not setting TARGET_ARCH is the equivalent of setting TARGET_ARCH=x86_64.<br/>
-`$ make TARGET_ARCH=x86_64` <br/>
+`$ make TARGET_ARCH=x86_64` <br/> `$ make TARGET_ARCH=aarch64` <br/>
    See [here](http://docs.nvidia.com/cuda/cuda-samples/index.html#cross-samples) for more details.
 *   **dbg=1** - build with debug symbols
    ```
--- a/Samples/simpleVulkan/shader_sine.frag
+++ b/Samples/simpleVulkan/shader_sine.frag
@@ -1,5 +1,6 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
+#extension GL_NV_gpu_shader5 : enable

 layout(location = 0) in vec3 fragColor;

--- a/Samples/simpleVulkan/shader_sine.vert
+++ b/Samples/simpleVulkan/shader_sine.vert
@@ -1,6 +1,6 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
-
+#extension GL_NV_gpu_shader5 : enable

 layout(binding = 0) uniform UniformBufferObject {
    mat4 model;
--- a/Samples/simpleVulkan/simpleVulkan_vs2013.vcxproj
+++ b/Samples/simpleVulkan/simpleVulkan_vs2013.vcxproj
@@ -33,7 +33,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(CUDAPropsPath)\CUDA 10.0.props" />
+    <Import Project="$(CUDAPropsPath)\CUDA 10.1.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets">
    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
@@ -67,11 +67,6 @@
      <Include>./;../../Common</Include>
      <Defines>WIN32</Defines>
    </CudaCompile>
-    <PostBuildEvent>
-        <Command>$(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.vert
-$(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.frag
-        </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
    <ClCompile>
@@ -117,6 +112,6 @@ $(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.frag
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(CUDAPropsPath)\CUDA 10.0.targets" />
+    <Import Project="$(CUDAPropsPath)\CUDA 10.1.targets" />
  </ImportGroup>
 </Project>
--- a/Samples/simpleVulkan/simpleVulkan_vs2015.vcxproj
+++ b/Samples/simpleVulkan/simpleVulkan_vs2015.vcxproj
@@ -33,7 +33,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(CUDAPropsPath)\CUDA 10.0.props" />
+    <Import Project="$(CUDAPropsPath)\CUDA 10.1.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets">
    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
@@ -67,11 +67,6 @@
      <Include>./;../../Common</Include>
      <Defines>WIN32</Defines>
    </CudaCompile>
-    <PostBuildEvent>
-        <Command>$(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.vert
-$(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.frag
-        </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
    <ClCompile>
@@ -117,6 +112,6 @@ $(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.frag
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(CUDAPropsPath)\CUDA 10.0.targets" />
+    <Import Project="$(CUDAPropsPath)\CUDA 10.1.targets" />
  </ImportGroup>
 </Project>
--- a/Samples/simpleVulkan/simpleVulkan_vs2017.vcxproj
+++ b/Samples/simpleVulkan/simpleVulkan_vs2017.vcxproj
@@ -34,7 +34,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(CUDAPropsPath)\CUDA 10.0.props" />
+    <Import Project="$(CUDAPropsPath)\CUDA 10.1.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets">
    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
@@ -68,11 +68,6 @@
      <Include>./;../../Common</Include>
      <Defines>WIN32</Defines>
    </CudaCompile>
-    <PostBuildEvent>
-        <Command>$(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.vert
-$(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.frag
-        </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
    <ClCompile>
@@ -118,6 +113,6 @@ $(VULKAN_SDK)/Bin/glslangValidator.exe -V shader_sine.frag
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(CUDAPropsPath)\CUDA 10.0.targets" />
+    <Import Project="$(CUDAPropsPath)\CUDA 10.1.targets" />
  </ImportGroup>
 </Project>
--- a/Samples/simpleVulkan/vulkanCUDASinewave.cu
+++ b/Samples/simpleVulkan/vulkanCUDASinewave.cu
@@ -883,8 +883,8 @@ class vulkanCudaApp {
  }

  void createGraphicsPipeline() {
-    auto vertShaderCode = readFile("vert.spv");
-    auto fragShaderCode = readFile("frag.spv");
+    auto vertShaderCode = readFile("shader_sine.vert");
+    auto fragShaderCode = readFile("shader_sine.frag");

    VkShaderModule vertShaderModule;
    VkShaderModule fragShaderModule;