From bff83aab4a0adf7ab4789df88387651e66f736c3 Mon Sep 17 00:00:00 2001 From: Dantali0n Date: Thu, 20 Jan 2022 11:09:33 +0100 Subject: [PATCH 1/4] Fix OpenCLVectorAdd example --- examples/OpenCLVectorAdd/CMakeLists.txt | 2 +- examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/OpenCLVectorAdd/CMakeLists.txt b/examples/OpenCLVectorAdd/CMakeLists.txt index e5b0bfca..df19fdb5 100644 --- a/examples/OpenCLVectorAdd/CMakeLists.txt +++ b/examples/OpenCLVectorAdd/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(TracyClient STATIC ../../TracyClient.cpp target_include_directories(TracyClient PUBLIC ../../) target_compile_definitions(TracyClient PUBLIC TRACY_ENABLE=1) -target_link_libraries(OpenCLVectorAdd PUBLIC OpenCL::OpenCL TracyClient) +target_link_libraries(OpenCLVectorAdd PUBLIC OpenCL::OpenCL TracyClient dl pthread) diff --git a/examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp b/examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp index d499424f..851cdd93 100644 --- a/examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp +++ b/examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp @@ -139,13 +139,14 @@ int main() for (int i = 0; i < 10; ++i) { + int n_value = static_cast(N); ZoneScopedN("VectorAdd Kernel Launch"); TracyCLZoneC(tracyCLCtx, "VectorAdd Kernel", tracy::Color::Blue4); CL_ASSERT(clSetKernelArg(vectorAddKernel, 0, sizeof(cl_mem), &bufferC)); CL_ASSERT(clSetKernelArg(vectorAddKernel, 1, sizeof(cl_mem), &bufferA)); CL_ASSERT(clSetKernelArg(vectorAddKernel, 2, sizeof(cl_mem), &bufferB)); - CL_ASSERT(clSetKernelArg(vectorAddKernel, 3, sizeof(int), &static_cast(N))); + CL_ASSERT(clSetKernelArg(vectorAddKernel, 3, sizeof(int), &n_value)); cl_event vectorAddKernelEvent; CL_ASSERT(clEnqueueNDRangeKernel(commandQueue, vectorAddKernel, 1, nullptr, &N, nullptr, 0, nullptr, &vectorAddKernelEvent)); From 1120f0b07ed19b486e29782f081d46406ac2d17a Mon Sep 17 00:00:00 2001 From: Dantali0n Date: Thu, 20 Jan 2022 12:42:51 +0100 Subject: [PATCH 2/4] Cross platform solution to linking OpenCLVectorAdd libraries --- examples/OpenCLVectorAdd/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/OpenCLVectorAdd/CMakeLists.txt b/examples/OpenCLVectorAdd/CMakeLists.txt index df19fdb5..cf4574fb 100644 --- a/examples/OpenCLVectorAdd/CMakeLists.txt +++ b/examples/OpenCLVectorAdd/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.0) project(OpenCLVectorAdd) +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads REQUIRED) + find_package(OpenCL REQUIRED) add_executable(OpenCLVectorAdd OpenCLVectorAdd.cpp) @@ -11,4 +14,4 @@ add_library(TracyClient STATIC ../../TracyClient.cpp target_include_directories(TracyClient PUBLIC ../../) target_compile_definitions(TracyClient PUBLIC TRACY_ENABLE=1) -target_link_libraries(OpenCLVectorAdd PUBLIC OpenCL::OpenCL TracyClient dl pthread) +target_link_libraries(OpenCLVectorAdd PUBLIC OpenCL::OpenCL TracyClient ${CMAKE_DL_LIBS} Threads::Threads) From e73d21f5daf692bc00f44d299618ea7f9750a120 Mon Sep 17 00:00:00 2001 From: Dantali0n Date: Thu, 20 Jan 2022 12:44:00 +0100 Subject: [PATCH 3/4] Bump OpenCLVectorAdd cmake version to 3.10 --- examples/OpenCLVectorAdd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/OpenCLVectorAdd/CMakeLists.txt b/examples/OpenCLVectorAdd/CMakeLists.txt index cf4574fb..71d0d595 100644 --- a/examples/OpenCLVectorAdd/CMakeLists.txt +++ b/examples/OpenCLVectorAdd/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.10) project(OpenCLVectorAdd) From 94bcc6ffcc485d86d934fc470021a5866b5a84b1 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Thu, 20 Jan 2022 13:02:38 +0100 Subject: [PATCH 4/4] Update OpenCLVectorAdd.cpp Cosmetics. --- examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp b/examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp index 851cdd93..b3ee0e44 100644 --- a/examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp +++ b/examples/OpenCLVectorAdd/OpenCLVectorAdd.cpp @@ -139,7 +139,7 @@ int main() for (int i = 0; i < 10; ++i) { - int n_value = static_cast(N); + int n_value = static_cast(N); ZoneScopedN("VectorAdd Kernel Launch"); TracyCLZoneC(tracyCLCtx, "VectorAdd Kernel", tracy::Color::Blue4);