diff --git a/.gitignore b/.gitignore index b3e505f..fba1d52 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ROCm-CompilerSupport-5.0.0.tar.gz /ROCm-CompilerSupport-5.1.0.tar.gz +/ROCm-CompilerSupport-5.2.0.tar.gz diff --git a/0001-COMGR-changes-needed-for-https-github.com-llvm-llvm-.patch b/0001-COMGR-changes-needed-for-https-github.com-llvm-llvm-.patch deleted file mode 100644 index b6a1600..0000000 --- a/0001-COMGR-changes-needed-for-https-github.com-llvm-llvm-.patch +++ /dev/null @@ -1,66 +0,0 @@ -From be2bcaaea228cdcb5981b261046175275c402fb9 Mon Sep 17 00:00:00 2001 -From: Konstantin Zhuravlyov -Date: Wed, 26 Jan 2022 12:02:52 -0500 -Subject: [PATCH] COMGR changes needed for - https://github.com/llvm/llvm-project/commit/83d59e05b201760e3f364ff6316301d347cbad95 - -Change-Id: Iac01d024463865734879faf5f814e0862c26f7a1 ---- - lib/comgr/src/comgr-compiler.cpp | 3 ++- - lib/comgr/src/comgr-env.h | 1 + - lib/comgr/src/comgr-objdump.cpp | 4 +++- - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp -index 6c2cba2..db4c8d5 100644 ---- a/lib/comgr/src/comgr-compiler.cpp -+++ b/lib/comgr/src/comgr-compiler.cpp -@@ -605,7 +605,8 @@ static amd_comgr_status_t linkWithLLD(llvm::ArrayRef Args, - ArrayRef ArgRefs = llvm::makeArrayRef(LLDArgs); - static std::mutex MScreen; - MScreen.lock(); -- bool LLDRet = lld::elf::link(ArgRefs, false, LogS, LogE); -+ bool LLDRet = lld::elf::link(ArgRefs, LogS, LogE, false, false); -+ lld::CommonLinkerContext::destroy(); - MScreen.unlock(); - if (!LLDRet) { - return AMD_COMGR_STATUS_ERROR; -diff --git a/lib/comgr/src/comgr-env.h b/lib/comgr/src/comgr-env.h -index eb13e61..aef57b3 100644 ---- a/lib/comgr/src/comgr-env.h -+++ b/lib/comgr/src/comgr-env.h -@@ -36,6 +36,7 @@ - #ifndef COMGR_ENV_H - #define COMGR_ENV_H - -+#include "llvm/ADT/Optional.h" - #include "llvm/ADT/StringRef.h" - - namespace COMGR { -diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp -index 094bbac..b41e6c1 100644 ---- a/lib/comgr/src/comgr-objdump.cpp -+++ b/lib/comgr/src/comgr-objdump.cpp -@@ -43,6 +43,7 @@ - #include "llvm/ADT/STLExtras.h" - #include "llvm/ADT/StringExtras.h" - #include "llvm/ADT/Triple.h" -+#include "llvm/CodeGen/CommandFlags.h" - #include "llvm/DebugInfo/DWARF/DWARFContext.h" - #include "llvm/DebugInfo/Symbolize/Symbolize.h" - #include "llvm/MC/MCAsmInfo.h" -@@ -2395,9 +2396,10 @@ llvm::DisassemHelper::disassembleAction(StringRef Input, - size_t ArgC = ArgV.size(); - ArgV.push_back(nullptr); - COMGR::clearLLVMOptions(); -+ llvm::codegen::RegisterCodeGenFlags CGF; - cl::ParseCommandLineOptions(ArgC, ArgV.data(), "llvm object file dumper\n", - &ErrS); -- MCPU = lld::getCPUStr(); -+ MCPU = llvm::codegen::getCPUStr(); - - ErrorOr> BufOrErr = - MemoryBuffer::getMemBuffer(Input); --- -2.35.1 - diff --git a/0001-Fix-cmake-file-location.patch b/0001-Fix-cmake-file-location.patch deleted file mode 100644 index 1693617..0000000 --- a/0001-Fix-cmake-file-location.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 75c1055f9840f3089b3d744e44faaa4a2fcd8803 Mon Sep 17 00:00:00 2001 -From: Jeremy Newton -Date: Tue, 25 Jan 2022 21:44:06 -0500 -Subject: [PATCH] Fix cmake file location - -This was found while attempting to package for Fedora. Fedora and most -rpm distros expect the cmake file to be installed into -${CMAKE_INSTALL_LIBDIR}/cmake, instead of hardcoded to lib/cmake. - -Signed-off-by: Jeremy Newton -Change-Id: Ibd41bada8220784f4b48f45efc776cf74ab0bfac ---- - lib/comgr/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt -index f15e9fd..eac270a 100644 ---- a/lib/comgr/CMakeLists.txt -+++ b/lib/comgr/CMakeLists.txt -@@ -209,7 +209,7 @@ target_include_directories(amd_comgr - set(AMD_COMGR_CONFIG_NAME amd_comgr-config.cmake) - set(AMD_COMGR_TARGETS_NAME amd_comgr-targets.cmake) - set(AMD_COMGR_VERSION_NAME amd_comgr-config-version.cmake) --set(AMD_COMGR_PACKAGE_PREFIX lib/cmake/amd_comgr) -+set(AMD_COMGR_PACKAGE_PREFIX ${CMAKE_INSTALL_LIBDIR}/cmake/amd_comgr) - - # Generate the build-tree package. - set(AMD_COMGR_PREFIX_CODE) --- -2.35.1 - diff --git a/rocm-compilersupport.spec b/rocm-compilersupport.spec index 978cc41..4cd70d4 100644 --- a/rocm-compilersupport.spec +++ b/rocm-compilersupport.spec @@ -1,11 +1,11 @@ %global upstreamname ROCm-CompilerSupport -%global rocm_release 5.1 +%global rocm_release 5.2 %global rocm_patch 0 %global rocm_version %{rocm_release}.%{rocm_patch} Name: rocm-compilersupport Version: %{rocm_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Various AMD ROCm LLVM related services Url: https://github.com/RadeonOpenCompute/ROCm-CompilerSupport @@ -15,12 +15,9 @@ Source0: https://github.com/RadeonOpenCompute/%{upstreamname}/archive/ref #https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/commit/5495595234e8fb7b1715429cfa41fe6d9c0e710c Patch0: 0001-Detect-if-clang-is-static-or-shared.patch -#https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/commit/75c1055f9840f3089b3d744e44faaa4a2fcd8803 -Patch1: 0001-Fix-cmake-file-location.patch - -#Fix build against LLVM 14, cherry-picked from amd-stg-open branch: -#https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/commit/616915650763f5d49ae66b4c11556a47821b9204 -Patch100: 0001-COMGR-changes-needed-for-https-github.com-llvm-llvm-.patch +#Revert one patch to avoid compilation issue: +# gfx1036 defines are not present in llvm 14 (should be in 15) +Patch100: 0001-Revert-Add-gfx1036.patch BuildRequires: cmake BuildRequires: clang-devel >= 14.0.0 @@ -89,6 +86,9 @@ sed -i -e "/compile_test/d" \ %{_libdir}/cmake/amd_comgr %changelog +* Sun Jul 03 2022 Jeremy Newton - 5.2.0-1 +- Update to 5.2.0 + * Fri Jun 10 2022 Jeremy Newton - 5.1.0-3 - Add comgr(rocm) provide diff --git a/sources b/sources index bba4b4e..6424bd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ROCm-CompilerSupport-5.1.0.tar.gz) = e0402eab4e1ce2aac0b2623e00e16ed5c7b211e99a7d90b995f2a243f1e844fc51f169305985bafb12cdc7c8fd4b5d60ef7ff2ce0b38c2790c7f0cec6115c468 +SHA512 (ROCm-CompilerSupport-5.2.0.tar.gz) = ecfbe974e5938d46672c3f421d35a9c0a13f7cdd4756be533b7a0da1cd8a05cb0deb2e2b11000e007f40def362acad662696dc7fd59462b457fd1452169cc156