From 24a617c043e6ec41b5c4f0df52fe81a19a140453 Mon Sep 17 00:00:00 2001 From: shawnz Date: Wed, 12 Feb 2025 12:22:55 +0800 Subject: [PATCH 1/3] Update source code for cudaGraphPerfScaling --- .../cudaGraphsPerfScaling/cudaGraphPerfScaling.cu | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Samples/6_Performance/cudaGraphsPerfScaling/cudaGraphPerfScaling.cu b/Samples/6_Performance/cudaGraphsPerfScaling/cudaGraphPerfScaling.cu index 2f8b6c9e..9699c83f 100644 --- a/Samples/6_Performance/cudaGraphsPerfScaling/cudaGraphPerfScaling.cu +++ b/Samples/6_Performance/cudaGraphsPerfScaling/cudaGraphPerfScaling.cu @@ -350,8 +350,10 @@ int main(int argc, char **argv) cudaFree(0); cudaMallocHost(&hostData, sizeof(*hostData)); - stream.resize(width); - for (int i = 0; i < width; i++) + int numStreams = width; + if (numStreams == 1) numStreams = 2; // demo needs two streams even if capture only needs 1. + stream.resize(numStreams); + for (int i = 0; i < numStreams; i++) { cudaStreamCreate(&stream[i]); } @@ -386,7 +388,7 @@ int main(int argc, char **argv) if (!(outputFmt & 6)) { printf("skipping trials since no output is expected\n"); - return EXIT_FAILURE; + return 1; } std::vector metricTotal; @@ -429,6 +431,9 @@ int main(int argc, char **argv) length += stride; } - printf("\n"); -} + cudaFreeHost(hostData); + printf("\n"); + printf("Test passed\n"); + return 0; +} From 7ee6db679e9b73716b008003a7ee5843c3441628 Mon Sep 17 00:00:00 2001 From: shawnz Date: Wed, 12 Feb 2025 15:49:29 +0800 Subject: [PATCH 2/3] Remove dupe target in cuda-c-linking CMakeLists.txt --- Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt b/Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt index 6e4fc351..166d0664 100644 --- a/Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt +++ b/Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt @@ -34,8 +34,7 @@ if (LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL "15" OR endif () add_executable(cuda-c-linking cuda-c-linking.cpp) -add_custom_target(clobber) -add_custom_target(testrun) + add_test(NAME cuda-c-linking COMMAND cuda-c-linking WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") From cc3d94f81c9e31e58c85a3587cd1e95b2a3591f4 Mon Sep 17 00:00:00 2001 From: shawnz Date: Wed, 12 Feb 2025 18:12:26 +0800 Subject: [PATCH 3/3] Update .dll copy for 7_libNVVM --- Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt | 9 +++++++++ Samples/7_libNVVM/device-side-launch/CMakeLists.txt | 12 ++++++------ Samples/7_libNVVM/ptxgen/CMakeLists.txt | 12 ++++++------ Samples/7_libNVVM/simple/CMakeLists.txt | 12 ++++++------ Samples/7_libNVVM/uvmlite/CMakeLists.txt | 12 ++++++------ 5 files changed, 33 insertions(+), 24 deletions(-) diff --git a/Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt b/Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt index 166d0664..cd8a943e 100644 --- a/Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt +++ b/Samples/7_libNVVM/cuda-c-linking/CMakeLists.txt @@ -81,3 +81,12 @@ set_target_properties(mathfuncs64 PROPERTIES PREFIX "lib" OUTPUT_NAME "mathfuncs64" SUFFIX ".a" CUDA_SEPERABLE_COMPILATION ON) install(TARGETS cuda-c-linking mathfuncs64 DESTINATION bin) + +if (WIN32) + add_custom_command( + TARGET cuda-c-linking + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_BINARY_DIR}/nvvm64_40_0.dll" "$" + ) +endif () \ No newline at end of file diff --git a/Samples/7_libNVVM/device-side-launch/CMakeLists.txt b/Samples/7_libNVVM/device-side-launch/CMakeLists.txt index c0edbb3a..4617fab3 100644 --- a/Samples/7_libNVVM/device-side-launch/CMakeLists.txt +++ b/Samples/7_libNVVM/device-side-launch/CMakeLists.txt @@ -53,10 +53,10 @@ add_custom_command( "${CMAKE_CURRENT_SOURCE_DIR}/dsl-gpu64.ll" "$" ) if (WIN32) -add_custom_command( - TARGET dsl - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${CMAKE_BINARY_DIR}/nvvm64_40_0.dll" "$" -) + add_custom_command( + TARGET dsl + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_BINARY_DIR}/nvvm64_40_0.dll" "$" + ) endif () diff --git a/Samples/7_libNVVM/ptxgen/CMakeLists.txt b/Samples/7_libNVVM/ptxgen/CMakeLists.txt index fb8a5855..aa136e17 100644 --- a/Samples/7_libNVVM/ptxgen/CMakeLists.txt +++ b/Samples/7_libNVVM/ptxgen/CMakeLists.txt @@ -51,10 +51,10 @@ add_custom_command( "${CMAKE_CURRENT_SOURCE_DIR}/test.ll" "$" ) if (WIN32) -add_custom_command( - TARGET ptxgen - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${CMAKE_BINARY_DIR}/nvvm64_40_0.dll" "$" -) + add_custom_command( + TARGET ptxgen + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_BINARY_DIR}/nvvm64_40_0.dll" "$" + ) endif () diff --git a/Samples/7_libNVVM/simple/CMakeLists.txt b/Samples/7_libNVVM/simple/CMakeLists.txt index 08672a1e..16331e6b 100644 --- a/Samples/7_libNVVM/simple/CMakeLists.txt +++ b/Samples/7_libNVVM/simple/CMakeLists.txt @@ -52,10 +52,10 @@ add_custom_command( "${CMAKE_CURRENT_SOURCE_DIR}/simple-gpu64.ll" "$" ) if (WIN32) -add_custom_command( - TARGET simple - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${CMAKE_BINARY_DIR}/nvvm64_40_0.dll" "$" -) + add_custom_command( + TARGET simple + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_BINARY_DIR}/nvvm64_40_0.dll" "$" + ) endif () diff --git a/Samples/7_libNVVM/uvmlite/CMakeLists.txt b/Samples/7_libNVVM/uvmlite/CMakeLists.txt index dbf1d723..0ed6e969 100644 --- a/Samples/7_libNVVM/uvmlite/CMakeLists.txt +++ b/Samples/7_libNVVM/uvmlite/CMakeLists.txt @@ -56,10 +56,10 @@ add_custom_command( "${CMAKE_CURRENT_SOURCE_DIR}/uvmlite64.ll" "$" ) if (WIN32) -add_custom_command( - TARGET uvmlite - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${CMAKE_BINARY_DIR}/nvvm64_40_0.dll" "$" -) + add_custom_command( + TARGET uvmlite + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_BINARY_DIR}/nvvm64_40_0.dll" "$" + ) endif ()