https://bugzilla.redhat.com/show_bug.cgi?id=2295820 --- Comment #17 from Jeremy Newton <alexjnewt@xxxxxxxxxxxx> --- I don't see any of the clang related changes. My suggestion was something like this: --- hipblaslt.spec 2024-07-27 09:07:58.103294755 -0400 +++ hipblaslt-new.spec 2024-07-27 09:29:35.897124803 -0400 @@ -6,7 +6,6 @@ %global toolchain rocm # hipcc does not support some clang flags %global build_cxxflags %(echo %{optflags} | sed -e 's/-fstack-protector-strong/-Xarch_host -fstack-protector-strong/' -e 's/-fcf-protection/-Xarch_host -fcf-protection/') -%global llvm_maj_ver 17 # It is necessary to use this with a local build # export QA_RPATHS=0xff @@ -25,18 +24,17 @@ Source0: %{url}/archive/rocm-%{rocm_version}.tar.gz#/%{upstreamname}-%{rocm_version}.tar.gz BuildRequires: cmake -BuildRequires: clang%{llvm_maj_ver} -BuildRequires: clang%{llvm_maj_ver}-tools-extra BuildRequires: git BuildRequires: hipblas-devel BuildRequires: hipcc -BuildRequires: lld%{llvm_maj_ver} +BuildRequires: hipcc-tools-extra BuildRequires: msgpack-devel BuildRequires: ninja-build BuildRequires: rocblas-devel BuildRequires: rocminfo BuildRequires: rocm-cmake BuildRequires: rocm-comgr-devel +BuildRequires: rocm-compilersupport-macros BuildRequires: rocm-hip-devel BuildRequires: rocm-runtime-devel BuildRequires: rocm-rpm-macros @@ -87,8 +85,8 @@ # rocm path sed -i -e 's@rocm_path=/opt/rocm@rocm_path=/usr@' tensilelite/Tensile/Ops/gen_assembly.sh -# No llvm/bin/clang, use clang++-17 -sed -i -e 's@toolchain=${rocm_path}/llvm/bin/clang++@toolchain=clang++-17@' tensilelite/Tensile/Ops/gen_assembly.sh +# No llvm/bin/clang, use clang++ from ROCm +sed -i -e 's@toolchain=${rocm_path}/llvm/bin/clang++@toolchain=clang++-%{rocmllvm_version}@' tensilelite/Tensile/Ops/gen_assembly.sh # Remove venv sed -i -e 's@. ${venv}/bin/activate@@' tensilelite/Tensile/Ops/gen_assembly.sh sed -i -e 's@deactivate@@' tensilelite/Tensile/Ops/gen_assembly.sh @@ -96,9 +94,9 @@ # change rocm path from /opt/rocm to /usr # need to be able to find hipcc, rocm-smi, extractkernel, rocm_agent_enumerator sed -i -e 's@opt/rocm@usr@' tensilelite/Tensile/Common.py -# look for clang things is 'usr' + '/lib64/llv17/bin' or similar +# look for clang things is 'usr' + '/lib64/llvm*/bin' or similar # need to be able to find clang++, ld.lld, clang-offload-bundler -sed -i -e 's@llvm/bin@lib64/llvm%{llvm_maj_ver}/bin@' tensilelite/Tensile/Common.py +sed -i -e 's@llvm/bin@lib64/llvm%{rocmllvm_version}/bin@' tensilelite/Tensile/Common.py # Use PATH to find where TensileGetPath and other tensile bins are sed -i -e 's@${Tensile_PREFIX}/bin/TensileGetPath@TensileGetPath@g' tensilelite/Tensile/cmake/TensileConfig.cmake @@ -157,7 +155,7 @@ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_C_COMPILER=hipcc \ -DCMAKE_CXX_COMPILER=hipcc \ - -DCMAKE_CXX_FLAGS="-fuse-ld=/usr/bin/ld.lld-%{llvm_maj_ver}" \ + -DCMAKE_CXX_FLAGS="-fuse-ld=/usr/bin/ld.lld-%{rocmllvm_version}" \ -DHIP_PLATFORM=amd \ -DROCM_SYMLINK_LIBS=OFF \ -DBUILD_WITH_TENSILE=ON \ -- You are receiving this mail because: You are on the CC list for the bug. You are always notified about changes to this product and component https://bugzilla.redhat.com/show_bug.cgi?id=2295820 Report this comment as SPAM: https://bugzilla.redhat.com/enter_bug.cgi?product=Bugzilla&format=report-spam&short_desc=Report%20of%20Bug%202295820%23c17 -- _______________________________________________ package-review mailing list -- package-review@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to package-review-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/package-review@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
