Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11037259
D14075.id34318.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D14075.id34318.diff
View Options
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -3,3 +3,6 @@
- Jacek Jagosz
- IRC: JacekJagosz
- Email: jacek.jagosz@outlook.com
+- Gavin Zhao
+ - Email: me@gzgz.dev
+ - Matrix: @gzgavinzhao:matrix.org
diff --git a/files/0001-Use-FHS-compliant-install.patch b/files/0001-Use-FHS-compliant-install.patch
--- a/files/0001-Use-FHS-compliant-install.patch
+++ b/files/0001-Use-FHS-compliant-install.patch
@@ -1,20 +1,22 @@
-From 61ff1491e80c7199bc79aa442cdcfb55986e774b Mon Sep 17 00:00:00 2001
+From 5972c2e8f5ffad6641b5623dbb00a816f2c3fdcd Mon Sep 17 00:00:00 2001
From: Mystro256 <alexjnewt@hotmail.com>
Date: Tue, 18 Jan 2022 12:50:05 -0500
Subject: [PATCH] Use FHS compliant install
-FHS does not allow installing to "amdgcn", but "LIBDIR/amdgcn" appears to be
-acceptable to the FHS and distros. This logic uses GNUInstallDirs to detect the
-LIBDIR instead of hardcoding it to "lib".
+FHS does not allow installing to "amdgcn", but "LIBDIR/amdgcn" appears
+to be acceptable to the FHS and distros. This logic uses GNUInstallDirs
+to detect the LIBDIR instead of hardcoding it to "lib".
E.g. Fedora/Redhat use lib64 instead of lib.
---
- cmake/OCL.cmake | 3 ++-
- cmake/Packages.cmake | 5 +++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
+ cmake/OCL.cmake | 3 ++-
+ cmake/Packages.cmake | 2 +-
+ test/constant_folding/CMakeLists.txt | 2 ++
+ test/constant_folding/RunConstantFoldTest.cmake | 1 +
+ 4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cmake/OCL.cmake b/cmake/OCL.cmake
-index 4e324e8..5bde654 100644
+index cc533be..b27eb5e 100644
--- a/cmake/OCL.cmake
+++ b/cmake/OCL.cmake
@@ -10,6 +10,7 @@
@@ -22,38 +24,63 @@
# we `file(WRITE)` a file with an @variable reference and `configure_file` it.
cmake_policy(SET CMP0053 OLD)
+include(GNUInstallDirs)
-
+
if (WIN32)
set(EXE_SUFFIX ".exe")
-@@ -33,7 +34,7 @@ set (BC_EXT .bc)
+@@ -45,7 +46,7 @@ set (BC_EXT .bc)
set (LIB_SUFFIX ".lib${BC_EXT}")
set (STRIP_SUFFIX ".strip${BC_EXT}")
set (FINAL_SUFFIX "${BC_EXT}")
-set (INSTALL_ROOT_SUFFIX "amdgcn/bitcode")
+set (INSTALL_ROOT_SUFFIX "${CMAKE_INSTALL_LIBDIR}/amdgcn/bitcode")
-
+
# Set `inc_options` to contain Clang command-line for include directories for
# current source directory.
diff --git a/cmake/Packages.cmake b/cmake/Packages.cmake
-index 715ed95..e948e96 100644
+index 07c60eb..f128365 100644
--- a/cmake/Packages.cmake
+++ b/cmake/Packages.cmake
-@@ -1,4 +1,5 @@
--set(PACKAGE_PREFIX lib/cmake/AMDDeviceLibs)
-+include(GNUInstallDirs)
-+set(PACKAGE_PREFIX ${CMAKE_INSTALL_LIBDIR}/cmake/AMDDeviceLibs)
-
- # Generate the build-tree package.
- # We know the absolute path to the build tree, so we leave
-@@ -16,7 +17,7 @@ configure_file(AMDDeviceLibsConfig.cmake.in
+@@ -16,7 +16,7 @@ configure_file(AMDDeviceLibsConfig.cmake.in
@ONLY)
-
-
+
+
-set(install_path_suffix "amdgcn/bitcode")
+set(install_path_suffix "${CMAKE_INSTALL_LIBDIR}/amdgcn/bitcode")
-
+
# Generate the install-tree package.
# We do not know the absolute path to the intall tree until we are installed,
---
-2.31.1
+diff --git a/test/constant_folding/CMakeLists.txt b/test/constant_folding/CMakeLists.txt
+index 317bc8d..f8555f6 100644
+--- a/test/constant_folding/CMakeLists.txt
++++ b/test/constant_folding/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ ## This file is distributed under the University of Illinois Open Source
+ ## License. See LICENSE.TXT for details.
+ ##===--------------------------------------------------------------------------
++include(GNUInstallDirs)
+
+ if(TARGET FileCheck)
+ set(FILECHECK_BIN $<TARGET_FILE:FileCheck>)
+@@ -30,6 +31,7 @@ function(add_constant_fold_test name)
+ -DFILECHECK_BIN=${FILECHECK_BIN}
+ -DOUTPUT_FILE=output.${name}.ll
+ -DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${name}.cl
++ -DAMDGCN_BITCODES=${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/amdgcn/bitcode
+ -DTEST_CPU=gfx900
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/RunConstantFoldTest.cmake)
+ endfunction()
+diff --git a/test/constant_folding/RunConstantFoldTest.cmake b/test/constant_folding/RunConstantFoldTest.cmake
+index 9045bbd..2ce414c 100644
+--- a/test/constant_folding/RunConstantFoldTest.cmake
++++ b/test/constant_folding/RunConstantFoldTest.cmake
+@@ -16,6 +16,7 @@ execute_process(COMMAND
+ -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU}
+ -Xclang -finclude-default-header
+ --rocm-path=${BINARY_DIR}
++ --rocm-device-lib-path=${AMDGCN_BITCODES}
+ -mllvm -amdgpu-simplify-libcall=0
+ -o ${OUTPUT_FILE} ${INPUT_FILE}
+ RESULT_VARIABLE CLANG_RESULT
+--
+2.37.3
diff --git a/files/0001-fix-atomic.fadd.f32.p1.f32.patch b/files/0001-fix-atomic.fadd.f32.p1.f32.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-fix-atomic.fadd.f32.p1.f32.patch
@@ -0,0 +1,24 @@
+From 66a1c5bdca86ef8108263f0a3e2e21a6a343b643 Mon Sep 17 00:00:00 2001
+From: Ron Lieberman <ron.lieberman@amd.com>
+Date: Tue, 12 Apr 2022 06:43:54 -0500
+Subject: [PATCH] fix atomic.fadd.f32.p1.f32 related to opaque pointers changes
+ in llvm
+
+Change-Id: I51a9ad703865218bee357b32e6be4fcd689b9071
+---
+ ockl/src/gaaf.cl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ockl/src/gaaf.cl b/ockl/src/gaaf.cl
+index a11dfe0..89787de 100644
+--- a/ockl/src/gaaf.cl
++++ b/ockl/src/gaaf.cl
+@@ -15,7 +15,7 @@
+ #define AC(P, E, V, O, R, S) __opencl_atomic_compare_exchange_strong(P, E, V, O, R, S)
+ #define AL(P, O, S) __opencl_atomic_load(P, O, S)
+
+-extern float __llvm_amdgcn_global_atomic_fadd_f32_p1f32_f32(__global float *, float) __asm("llvm.amdgcn.global.atomic.fadd.f32.p1f32.f32");
++extern float __llvm_amdgcn_global_atomic_fadd_f32_p1f32_f32(__global float *, float) __asm("llvm.amdgcn.global.atomic.fadd.f32.p1.f32");
+
+ static void
+ global_atomic_fadd(__global float *p, float v)
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : rocm-device-libs
-version : 5.1.3
-release : 1
+version : 5.3.3
+release : 2
source :
- - https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/refs/tags/rocm-5.1.3.tar.gz : c41958560ec29c8bf91332b9f668793463904a2081c330c0d828bf2f91d4f04e
+ - https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/refs/tags/rocm-5.3.3.tar.gz : 963c9a0561111788b55a8c3b492e2a5737047914752376226c97a28122a4d768
license : NCSA
component : xorg.driver
clang : yes
@@ -20,8 +20,15 @@
- rocm-cmake
setup : |
%patch -p1 < $pkgfiles/0001-Use-FHS-compliant-install.patch
+ %patch -p1 < $pkgfiles/0001-fix-atomic.fadd.f32.p1.f32.patch
%cmake_ninja
build : |
%ninja_build
install : |
%ninja_install
+
+ # mv $installdir/usr/amdgcn $installdir/%libdir%/
+check : |
+ if [ -d /dev/kfd ]; then
+ %ninja_check
+ fi
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -53,6 +53,11 @@
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_1033.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_1034.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_1035.bc</Path>
+ <Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_1036.bc</Path>
+ <Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_1100.bc</Path>
+ <Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_1101.bc</Path>
+ <Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_1102.bc</Path>
+ <Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_1103.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_600.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_601.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_602.bc</Path>
@@ -75,13 +80,14 @@
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_909.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_90a.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_90c.bc</Path>
+ <Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_isa_version_940.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_unsafe_math_off.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_unsafe_math_on.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_wavefrontsize64_off.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/oclc_wavefrontsize64_on.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/ocml.bc</Path>
<Path fileType="library">/usr/lib64/amdgcn/bitcode/opencl.bc</Path>
- <Path fileType="doc">/usr/share/doc/ROCm-Device-Libs/rocm-device-libs/LICENSE.TXT</Path>
+ <Path fileType="doc">/usr/share/doc/ROCm-Device-Libs/LICENSE.TXT</Path>
</Files>
</Package>
<Package>
@@ -97,19 +103,19 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="1">rocm-device-libs</Dependency>
+ <Dependency release="2">rocm-device-libs</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib64/cmake/AMDDeviceLibs/AMDDeviceLibsConfig.cmake</Path>
</Files>
</Package>
<History>
- <Update release="1">
- <Date>2022-07-01</Date>
- <Version>5.1.3</Version>
+ <Update release="2">
+ <Date>2023-04-30</Date>
+ <Version>5.3.3</Version>
<Comment>Packaging update</Comment>
<Name>Jacek Jagosz</Name>
<Email>jacek.jagosz@outlook.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Aug 10, 8:20 PM (1 d, 4 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5805366
Default Alt Text
D14075.id34318.diff (9 KB)
Attached To
Mode
D14075: Update rocm-device-libs to 5.3.3
Attached
Detach File
Event Timeline
Log In to Comment