From 53bdffa1e5b738f59d84941f183252c6a373e1b9 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Tue, 2 May 2023 09:34:18 +0000 Subject: [PATCH 01/25] SWDEV-1 - - Switch to new patch version Change-Id: I0a0814d335e8c3d9a80c1217d8d2df62e7baa548 --- hipamd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index 00c6a3f045..94bb8ed63f 100755 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -49,7 +49,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ############################# option(BUILD_HIPIFY_CLANG "Enable building the CUDA->HIP converter" OFF) option(__HIP_ENABLE_PCH "Enable/Disable pre-compiled hip headers" ON) -option(HIP_OFFICIAL_BUILD "Enable/Disable for mainline/staging builds" OFF) +option(HIP_OFFICIAL_BUILD "Enable/Disable for mainline/staging builds" ON) # Disable file reorg backward compatibility for ASAN packaging if(NOT ENABLE_ASAN_PACKAGING) option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorg with backward compatibility" ON) From 20792433da431750c78a64d9af0f7e153e7f1678 Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Wed, 31 May 2023 18:13:22 +0000 Subject: [PATCH 02/25] SWDEV-403384 - Change OpenCL version number from 3581 to 3582 Change-Id: Ia451c84750d33c96c2a435469694794d78fb2725 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index c4e0b83834..9be8848d46 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3581 +#define AMD_PLATFORM_BUILD_NUMBER 3582 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From c080c1405660e9fadbc1e13d945afff83b35e42d Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Thu, 15 Jun 2023 18:06:45 +0000 Subject: [PATCH 03/25] SWDEV-1 - Bump OpenCL build number to 3583 For last mainline promotion based on 15-May-2023 build. Change-Id: Ia2381211df6807df1c8cb265a625c726cd7ab290 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 9be8848d46..b70a8aa295 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3582 +#define AMD_PLATFORM_BUILD_NUMBER 3583 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 276d659929e7981a1b85fc48d362ce54898a3808 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 12 Jul 2023 22:56:30 +0000 Subject: [PATCH 04/25] SWDEV-2 - Change OpenCL version number from 3583 to 3588 Change-Id: Ic3916acc6706444717b0c520ed5056e78a76505f --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index b70a8aa295..0c0dcab1ed 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3583 +#define AMD_PLATFORM_BUILD_NUMBER 3588 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From f5021ed145522ac23ca5fb2736cc8e8be5256f03 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 19 Jul 2023 06:44:07 +0000 Subject: [PATCH 05/25] SWDEV-2 - Change OpenCL version number from 3588 to 3590 Change-Id: I85fef1bdc27aea2350ad36184625ebcf3c971c51 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 0c0dcab1ed..08fd3c311c 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3588 +#define AMD_PLATFORM_BUILD_NUMBER 3590 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From cefafdba230f82c1b1e5da09146f2a83daa2896d Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Thu, 24 Aug 2023 06:21:47 -0700 Subject: [PATCH 06/25] SWDEV-2 - Change OpenCL version number from 3590 to 3594 Change-Id: Ia4fb1f59720c62fc872c0ed7cc4e8625353d7079 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 08fd3c311c..4355beeed3 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3590 +#define AMD_PLATFORM_BUILD_NUMBER 3594 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From fe4cce8326ad553df1f96eb1496e892220a86e6e Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Tue, 5 Sep 2023 12:41:01 +0000 Subject: [PATCH 07/25] SWDEV-2 - Change OpenCL version number from 3594 to 3596 Change-Id: I0bb923950f814052f51d15d59fabaa2cafd679a9 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 4355beeed3..dbc6a30908 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3594 +#define AMD_PLATFORM_BUILD_NUMBER 3596 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From dd5573216c6a52e83f7f1b037435ad1c88a1b590 Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Fri, 29 Sep 2023 14:37:21 +0000 Subject: [PATCH 08/25] SWDEV-2 - Change OpenCL version number from 3596 to 3600 Change-Id: Icc81cb530ffd2ed10daf1c3cbf4c973ec9ab67f1 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index dbc6a30908..97a5b5555e 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3596 +#define AMD_PLATFORM_BUILD_NUMBER 3600 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From a505a6a2c44a75574f0e45eb69b948b6ee16ec80 Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Mon, 16 Oct 2023 21:31:07 +0530 Subject: [PATCH 09/25] SWDEV-2 - Change OpenCL version number from 3600 to 3602 Change-Id: I7a99a04040e1e1de4f1c9d7ea6e06302f03d5f26 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 97a5b5555e..1f8b4586f6 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3600 +#define AMD_PLATFORM_BUILD_NUMBER 3602 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 08aa6bd4739ded6c2bb2495c17b5331dbcf91302 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Thu, 21 Dec 2023 13:55:54 +0000 Subject: [PATCH 10/25] SWDEV-2 - Change OpenCL version number from 3602 to 3610 Change-Id: If838e5fb70840574853177fced072cd2620be37a --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 1f8b4586f6..6e7a752dc9 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3602 +#define AMD_PLATFORM_BUILD_NUMBER 3610 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 3a954afdc4df5a4dce2d89ec7e7fd3e432394ce5 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 3 Jan 2024 06:39:41 +0000 Subject: [PATCH 11/25] SWDEV-2 - Change OpenCL version number from 3610 to 3612 Change-Id: I2b99f63785885f1c3a03520af8cb06e184a5c31c --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 6e7a752dc9..e9dff50e20 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3610 +#define AMD_PLATFORM_BUILD_NUMBER 3612 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 8b6f27a1c57ca39d2f0d954fcbe85c55b82980ee Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Thu, 18 Jan 2024 07:46:42 +0000 Subject: [PATCH 12/25] SWDEV-2 - Change OpenCL version number from 3612 to 3614 Change-Id: I257bf31012f300dd4afb10db409dcd588d68503e --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index e9dff50e20..51375edd49 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3612 +#define AMD_PLATFORM_BUILD_NUMBER 3614 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From bfb1ccc69eaaf675e70803fb414356e470a84198 Mon Sep 17 00:00:00 2001 From: Julia Jiang Date: Thu, 8 Feb 2024 16:57:16 -0500 Subject: [PATCH 13/25] SWDEV-444098 - Porting the fix to mainline for removal of rocm-ocl-icd package Change-Id: I17643c8d6f66e7a71e2b7385986f5ff654345a62 --- opencl/CMakeLists.txt | 19 +++++-------------- opencl/packaging/CMakeLists.txt | 6 ------ opencl/tests/ocltst/env/CMakeLists.txt | 9 +++++---- opencl/tests/ocltst/module/gl/CMakeLists.txt | 4 +--- .../tests/ocltst/module/perf/CMakeLists.txt | 7 ++++--- .../ocltst/module/runtime/CMakeLists.txt | 7 ++++--- opencl/tools/clinfo/CMakeLists.txt | 2 +- 7 files changed, 20 insertions(+), 34 deletions(-) diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt index 658547f118..523eb2b5c2 100644 --- a/opencl/CMakeLists.txt +++ b/opencl/CMakeLists.txt @@ -15,7 +15,7 @@ set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory") include(GNUInstallDirs) option(BUILD_TESTS "Enable building OpenCL tests" OFF) -option(BUILD_ICD "Enable building OpenCL ICD Loader" ON) +option(BUILD_ICD "Enable building OpenCL ICD Loader" OFF) option(EMU_ENV "Enable building for emulation environment" OFF) option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorganization backward compatibility" OFF) @@ -26,6 +26,10 @@ if(MSVC) endif() set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "") + +###--- Packaging ------------------------------------------------------------### + +# DEV package if(BUILD_ICD) add_subdirectory(khronos/icd) else() @@ -38,19 +42,6 @@ if(BUILD_TESTS) add_subdirectory(tests/ocltst) endif() -###--- Packaging ------------------------------------------------------------### - -# DEV package -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" - DESTINATION include - COMPONENT DEV - PATTERN cl_d3d10.h EXCLUDE - PATTERN cl_d3d11.h EXCLUDE - PATTERN cl_dx9_media_sharing.h EXCLUDE - PATTERN cl_egl.h EXCLUDE - PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) - ############################# # Packaging steps ############################# diff --git a/opencl/packaging/CMakeLists.txt b/opencl/packaging/CMakeLists.txt index d9329c4150..3643f88e7b 100644 --- a/opencl/packaging/CMakeLists.txt +++ b/opencl/packaging/CMakeLists.txt @@ -22,12 +22,6 @@ install(TARGETS amdocl DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT asan) install(FILES ${opencl_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary) install(FILES ${opencl_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan COMPONENT asan) -install(DIRECTORY ${opencl_SOURCE_DIR}/khronos/headers/opencl2.2/CL - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev - USE_SOURCE_PERMISSIONS - PATTERN cl_d3d10.h EXCLUDE - PATTERN cl_d3d11.h EXCLUDE - PATTERN cl_dx9_media_sharing.h EXCLUDE ) if(BUILD_ICD) install(TARGETS OpenCL DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT icd ) diff --git a/opencl/tests/ocltst/env/CMakeLists.txt b/opencl/tests/ocltst/env/CMakeLists.txt index 308acc7d6c..13dec123f1 100644 --- a/opencl/tests/ocltst/env/CMakeLists.txt +++ b/opencl/tests/ocltst/env/CMakeLists.txt @@ -34,10 +34,11 @@ target_include_directories(ocltst PRIVATE $) -target_link_libraries(ocltst - PRIVATE - OpenCL - ) +target_link_libraries(ocltst PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS}) + +if(NOT WIN32) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") +endif() set_target_properties(ocltst PROPERTIES INSTALL_RPATH "$ORIGIN") diff --git a/opencl/tests/ocltst/module/gl/CMakeLists.txt b/opencl/tests/ocltst/module/gl/CMakeLists.txt index 115879cf15..41dffa15b6 100644 --- a/opencl/tests/ocltst/module/gl/CMakeLists.txt +++ b/opencl/tests/ocltst/module/gl/CMakeLists.txt @@ -45,9 +45,7 @@ target_include_directories(oclgl PRIVATE $) -target_link_libraries(oclgl - PRIVATE - OpenCL +target_link_libraries(oclgl PRIVATE ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES}) diff --git a/opencl/tests/ocltst/module/perf/CMakeLists.txt b/opencl/tests/ocltst/module/perf/CMakeLists.txt index b9780283c6..e0134c9225 100644 --- a/opencl/tests/ocltst/module/perf/CMakeLists.txt +++ b/opencl/tests/ocltst/module/perf/CMakeLists.txt @@ -95,9 +95,10 @@ target_include_directories(oclperf PRIVATE $) -target_link_libraries(oclperf - PRIVATE - OpenCL) +target_link_libraries(oclperf PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS}) +if(NOT WIN32) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") +endif() add_custom_command( TARGET oclperf POST_BUILD diff --git a/opencl/tests/ocltst/module/runtime/CMakeLists.txt b/opencl/tests/ocltst/module/runtime/CMakeLists.txt index 0b5de94176..1ffd58ad0f 100644 --- a/opencl/tests/ocltst/module/runtime/CMakeLists.txt +++ b/opencl/tests/ocltst/module/runtime/CMakeLists.txt @@ -68,9 +68,10 @@ target_include_directories(oclruntime PRIVATE $) -target_link_libraries(oclruntime - PRIVATE - OpenCL) +target_link_libraries(oclruntime PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS}) +if(NOT WIN32) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") +endif() add_custom_command( TARGET oclruntime POST_BUILD diff --git a/opencl/tools/clinfo/CMakeLists.txt b/opencl/tools/clinfo/CMakeLists.txt index 217f18225b..da795267d1 100644 --- a/opencl/tools/clinfo/CMakeLists.txt +++ b/opencl/tools/clinfo/CMakeLists.txt @@ -4,7 +4,7 @@ target_compile_definitions(clinfo PRIVATE CL_TARGET_OPENCL_VERSION=220 HAVE_CL2_ target_include_directories(clinfo PRIVATE ${OPENCL_ICD_LOADER_HEADERS_DIR}) -target_link_libraries(clinfo OpenCL) +target_link_libraries(clinfo OpenCL::OpenCL) INSTALL(TARGETS clinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) From 67f5fae080ec73143aeed04961aaf3ae04079e3e Mon Sep 17 00:00:00 2001 From: Julia Jiang Date: Mon, 18 Mar 2024 18:11:31 -0400 Subject: [PATCH 14/25] Revert "SWDEV-444098 - Porting the fix to mainline for removal of rocm-ocl-icd package" This reverts commit bfb1ccc69eaaf675e70803fb414356e470a84198. Reason for revert: to keep stable mainline build Change-Id: Iccb2f5ce1d35f906e51a8916664f8cfe1999c69c --- opencl/CMakeLists.txt | 19 ++++++++++++++----- opencl/packaging/CMakeLists.txt | 6 ++++++ opencl/tests/ocltst/env/CMakeLists.txt | 9 ++++----- opencl/tests/ocltst/module/gl/CMakeLists.txt | 4 +++- .../tests/ocltst/module/perf/CMakeLists.txt | 7 +++---- .../ocltst/module/runtime/CMakeLists.txt | 7 +++---- opencl/tools/clinfo/CMakeLists.txt | 2 +- 7 files changed, 34 insertions(+), 20 deletions(-) diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt index 523eb2b5c2..658547f118 100644 --- a/opencl/CMakeLists.txt +++ b/opencl/CMakeLists.txt @@ -15,7 +15,7 @@ set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory") include(GNUInstallDirs) option(BUILD_TESTS "Enable building OpenCL tests" OFF) -option(BUILD_ICD "Enable building OpenCL ICD Loader" OFF) +option(BUILD_ICD "Enable building OpenCL ICD Loader" ON) option(EMU_ENV "Enable building for emulation environment" OFF) option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorganization backward compatibility" OFF) @@ -26,10 +26,6 @@ if(MSVC) endif() set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "") - -###--- Packaging ------------------------------------------------------------### - -# DEV package if(BUILD_ICD) add_subdirectory(khronos/icd) else() @@ -42,6 +38,19 @@ if(BUILD_TESTS) add_subdirectory(tests/ocltst) endif() +###--- Packaging ------------------------------------------------------------### + +# DEV package +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" + DESTINATION include + COMPONENT DEV + PATTERN cl_d3d10.h EXCLUDE + PATTERN cl_d3d11.h EXCLUDE + PATTERN cl_dx9_media_sharing.h EXCLUDE + PATTERN cl_egl.h EXCLUDE + PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) + ############################# # Packaging steps ############################# diff --git a/opencl/packaging/CMakeLists.txt b/opencl/packaging/CMakeLists.txt index 3643f88e7b..d9329c4150 100644 --- a/opencl/packaging/CMakeLists.txt +++ b/opencl/packaging/CMakeLists.txt @@ -22,6 +22,12 @@ install(TARGETS amdocl DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT asan) install(FILES ${opencl_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary) install(FILES ${opencl_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan COMPONENT asan) +install(DIRECTORY ${opencl_SOURCE_DIR}/khronos/headers/opencl2.2/CL + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev + USE_SOURCE_PERMISSIONS + PATTERN cl_d3d10.h EXCLUDE + PATTERN cl_d3d11.h EXCLUDE + PATTERN cl_dx9_media_sharing.h EXCLUDE ) if(BUILD_ICD) install(TARGETS OpenCL DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT icd ) diff --git a/opencl/tests/ocltst/env/CMakeLists.txt b/opencl/tests/ocltst/env/CMakeLists.txt index 13dec123f1..308acc7d6c 100644 --- a/opencl/tests/ocltst/env/CMakeLists.txt +++ b/opencl/tests/ocltst/env/CMakeLists.txt @@ -34,11 +34,10 @@ target_include_directories(ocltst PRIVATE $) -target_link_libraries(ocltst PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS}) - -if(NOT WIN32) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") -endif() +target_link_libraries(ocltst + PRIVATE + OpenCL + ) set_target_properties(ocltst PROPERTIES INSTALL_RPATH "$ORIGIN") diff --git a/opencl/tests/ocltst/module/gl/CMakeLists.txt b/opencl/tests/ocltst/module/gl/CMakeLists.txt index 41dffa15b6..115879cf15 100644 --- a/opencl/tests/ocltst/module/gl/CMakeLists.txt +++ b/opencl/tests/ocltst/module/gl/CMakeLists.txt @@ -45,7 +45,9 @@ target_include_directories(oclgl PRIVATE $) -target_link_libraries(oclgl PRIVATE +target_link_libraries(oclgl + PRIVATE + OpenCL ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES}) diff --git a/opencl/tests/ocltst/module/perf/CMakeLists.txt b/opencl/tests/ocltst/module/perf/CMakeLists.txt index e0134c9225..b9780283c6 100644 --- a/opencl/tests/ocltst/module/perf/CMakeLists.txt +++ b/opencl/tests/ocltst/module/perf/CMakeLists.txt @@ -95,10 +95,9 @@ target_include_directories(oclperf PRIVATE $) -target_link_libraries(oclperf PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS}) -if(NOT WIN32) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") -endif() +target_link_libraries(oclperf + PRIVATE + OpenCL) add_custom_command( TARGET oclperf POST_BUILD diff --git a/opencl/tests/ocltst/module/runtime/CMakeLists.txt b/opencl/tests/ocltst/module/runtime/CMakeLists.txt index 1ffd58ad0f..0b5de94176 100644 --- a/opencl/tests/ocltst/module/runtime/CMakeLists.txt +++ b/opencl/tests/ocltst/module/runtime/CMakeLists.txt @@ -68,10 +68,9 @@ target_include_directories(oclruntime PRIVATE $) -target_link_libraries(oclruntime PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS}) -if(NOT WIN32) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") -endif() +target_link_libraries(oclruntime + PRIVATE + OpenCL) add_custom_command( TARGET oclruntime POST_BUILD diff --git a/opencl/tools/clinfo/CMakeLists.txt b/opencl/tools/clinfo/CMakeLists.txt index da795267d1..217f18225b 100644 --- a/opencl/tools/clinfo/CMakeLists.txt +++ b/opencl/tools/clinfo/CMakeLists.txt @@ -4,7 +4,7 @@ target_compile_definitions(clinfo PRIVATE CL_TARGET_OPENCL_VERSION=220 HAVE_CL2_ target_include_directories(clinfo PRIVATE ${OPENCL_ICD_LOADER_HEADERS_DIR}) -target_link_libraries(clinfo OpenCL::OpenCL) +target_link_libraries(clinfo OpenCL) INSTALL(TARGETS clinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) From 1d20b9813d6bffb57000788bc3c94b5147b545a2 Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Thu, 4 Apr 2024 10:36:18 +0000 Subject: [PATCH 15/25] SWDEV-2 - Change OpenCL version number from 3614 to 3620 Change-Id: I0ff1ab1b5b3a934fb4bdcf744874c2aae86a068d --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 51375edd49..6e3b5be9f8 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3614 +#define AMD_PLATFORM_BUILD_NUMBER 3620 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 6e2222be43e5688324e37e6244f02073a3d3a254 Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Tue, 30 Apr 2024 07:15:53 +0000 Subject: [PATCH 16/25] SWDEV-2 - Change OpenCL version number from 3620 to 3622 Change-Id: I99c27ab97d3ec54c3de7712e652fd3bda7491926 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 6e3b5be9f8..a06b35e0ce 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3620 +#define AMD_PLATFORM_BUILD_NUMBER 3622 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From e577c9acc68ef68bb05fc666e503bfccf6985fa6 Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Tue, 25 Jun 2024 18:58:46 +0000 Subject: [PATCH 17/25] SWDEV-2 - Change OpenCL version number from 3622 to 3630 Change-Id: I3b1aa3925c5b0c90d1bcc1dd881a74bd16509791 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index a06b35e0ce..49f4ab6eb2 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3622 +#define AMD_PLATFORM_BUILD_NUMBER 3630 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From de91dc5acaf4d805e7bb62a5bc4f9ac5b3e4343c Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Tue, 6 Aug 2024 07:00:38 +0000 Subject: [PATCH 18/25] SWDEV-2 - Change OpenCL version number from 3630 to 3632 Change-Id: Iec52a26d08096bcc06dced63526184a0866058e4 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 49f4ab6eb2..b486abe5ad 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3630 +#define AMD_PLATFORM_BUILD_NUMBER 3632 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 1a9c8df95c1f64e877a49a93f748d3f30a4f0ec3 Mon Sep 17 00:00:00 2001 From: Rakesh Roy Date: Tue, 20 Aug 2024 16:26:31 +0000 Subject: [PATCH 19/25] SWDEV-2 - Change OpenCL version number from 3632 to 3634 Change-Id: I1c7f47735d9018a1bad278f5e4c6d49320947c46 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index b486abe5ad..4284fa2117 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3632 +#define AMD_PLATFORM_BUILD_NUMBER 3634 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 220465dc4e4195977a6fe9367480cadf8aaf06f9 Mon Sep 17 00:00:00 2001 From: Satyanvesh Dittakavi Date: Sun, 1 Dec 2024 08:31:56 +0000 Subject: [PATCH 20/25] SWDEV-2 - Change OpenCL version number from 3634 to 3642 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 4284fa2117..e7c6cdc6c8 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3634 +#define AMD_PLATFORM_BUILD_NUMBER 3642 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 03366da472291b61eabf3c2cc08c5e795fffc406 Mon Sep 17 00:00:00 2001 From: Satyanvesh Dittakavi Date: Fri, 6 Dec 2024 14:38:27 +0000 Subject: [PATCH 21/25] SWDEV-2 - Change OpenCL version number from 3642 to 3644 Change-Id: I7fcdfe4d1902155d950762d7c7c0b961cfc2fe5c --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index e7c6cdc6c8..76641211e5 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3642 +#define AMD_PLATFORM_BUILD_NUMBER 3644 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 9c3f9f8bf614ecc121b478690e53528c632a8307 Mon Sep 17 00:00:00 2001 From: Satyanvesh Dittakavi Date: Fri, 13 Dec 2024 12:12:41 +0000 Subject: [PATCH 22/25] SWDEV-2 - Change OpenCL version number from 3644 to 3646 Change-Id: Iedd80d7c23da082fc4aa55e87801dd7d25f93880 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 76641211e5..76e024389d 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3644 +#define AMD_PLATFORM_BUILD_NUMBER 3646 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 0c88197b0d2fa75341ddb2172d53ab223074a29d Mon Sep 17 00:00:00 2001 From: Satyanvesh Dittakavi Date: Fri, 20 Dec 2024 11:02:23 +0000 Subject: [PATCH 23/25] SWDEV-2 - Change OpenCL version number from 3646 to 3648 Change-Id: I3bd35b8f8c7bc081640a4343121ec6f24af90661 --- rocclr/utils/versions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 76e024389d..6adec78b67 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3646 +#define AMD_PLATFORM_BUILD_NUMBER 3648 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER From 499cee39faf21de99a0e76f7124a06d86086ee05 Mon Sep 17 00:00:00 2001 From: Alex Voicu Date: Tue, 25 Feb 2025 19:55:33 +0000 Subject: [PATCH 24/25] SPIRV cannot robustly deal with some builtins yet, so bypass them for now. --- hipamd/include/hip/amd_detail/amd_hip_bf16.h | 2 +- hipamd/include/hip/amd_detail/amd_hip_fp16.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hipamd/include/hip/amd_detail/amd_hip_bf16.h b/hipamd/include/hip/amd_detail/amd_hip_bf16.h index 0a5d1497fd..c1b2405cd8 100644 --- a/hipamd/include/hip/amd_detail/amd_hip_bf16.h +++ b/hipamd/include/hip/amd_detail/amd_hip_bf16.h @@ -1835,7 +1835,7 @@ __BF16_DEVICE_STATIC__ __hip_bfloat162 h2trunc(const __hip_bfloat162 h) { */ __BF16_DEVICE_STATIC__ __hip_bfloat162 unsafeAtomicAdd(__hip_bfloat162* address, __hip_bfloat162 value) { -#if __has_builtin(__builtin_amdgcn_flat_atomic_fadd_v2bf16) +#if __has_builtin(__builtin_amdgcn_flat_atomic_fadd_v2bf16) && !defined(__SPIRV__) typedef short __attribute__((ext_vector_type(2))) vec_short2; static_assert(sizeof(vec_short2) == sizeof(__hip_bfloat162_raw)); union { diff --git a/hipamd/include/hip/amd_detail/amd_hip_fp16.h b/hipamd/include/hip/amd_detail/amd_hip_fp16.h index 1a08bb8df1..b7b0d8a625 100644 --- a/hipamd/include/hip/amd_detail/amd_hip_fp16.h +++ b/hipamd/include/hip/amd_detail/amd_hip_fp16.h @@ -1530,7 +1530,7 @@ THE SOFTWARE. // Atomic #if defined(__clang__) && defined(__HIP__) inline __device__ __half2 unsafeAtomicAdd(__half2* address, __half2 value) { - #if __has_builtin(__builtin_amdgcn_flat_atomic_fadd_v2f16) + #if __has_builtin(__builtin_amdgcn_flat_atomic_fadd_v2f16) && !defined(__SPIRV__) // The api expects an ext_vector_type of half typedef _Float16 __attribute__((ext_vector_type(2))) vec_fp162; static_assert(sizeof(vec_fp162) == sizeof(__half2_raw)); From a0c96558ecd23284aad632a8fac1b8566156b0c3 Mon Sep 17 00:00:00 2001 From: Alex Voicu Date: Wed, 26 Feb 2025 14:14:12 +0000 Subject: [PATCH 25/25] Remove noise. --- hipamd/CMakeLists.txt | 2 +- rocclr/utils/versions.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index 9538dbbad0..f0c6d7f918 100755 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -44,7 +44,7 @@ list(APPEND CMAKE_MODULE_PATH ${HIP_COMMON_DIR}/cmake) # Options ############################# option(__HIP_ENABLE_PCH "Enable/Disable pre-compiled hip headers" ON) -option(HIP_OFFICIAL_BUILD "Enable/Disable for mainline/staging builds" ON) +option(HIP_OFFICIAL_BUILD "Enable/Disable for mainline/staging builds" OFF) option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorg with backward compatibility" OFF) option(BUILD_SHARED_LIBS "Build the shared library" ON) diff --git a/rocclr/utils/versions.hpp b/rocclr/utils/versions.hpp index 6adec78b67..c4e0b83834 100644 --- a/rocclr/utils/versions.hpp +++ b/rocclr/utils/versions.hpp @@ -28,7 +28,7 @@ #endif // AMD_PLATFORM_NAME #ifndef AMD_PLATFORM_BUILD_NUMBER -#define AMD_PLATFORM_BUILD_NUMBER 3648 +#define AMD_PLATFORM_BUILD_NUMBER 3581 #endif // AMD_PLATFORM_BUILD_NUMBER #ifndef AMD_PLATFORM_REVISION_NUMBER