From 606bc292b9bc97365c06acafe2dcd3b3db0d567c Mon Sep 17 00:00:00 2001
From: Donato Capitella <donato.capitella@reversec.com>
Date: Wed, 4 Feb 2026 16:59:43 +0000
Subject: [PATCH] attempting other ways to apply LLVM patch to rocm7

---
 toolboxes/Dockerfile.rocm-7.2        | 4 +---
 toolboxes/Dockerfile.rocm7-nightlies | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/toolboxes/Dockerfile.rocm-7.2 b/toolboxes/Dockerfile.rocm-7.2
index bc0468f..97eae55 100644
--- a/toolboxes/Dockerfile.rocm-7.2
+++ b/toolboxes/Dockerfile.rocm-7.2
@@ -36,14 +36,12 @@ ENV ROCM_PATH=/opt/rocm \
 WORKDIR /opt/llama.cpp
 RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
-# Temporary workaround for ROCm 7 performance regression (https://github.com/ROCm/rocm-systems/issues/2865#issuecomment-3846679806)
-ENV HIP_LLVM_FLAGS="-mllvm --amdgpu-unroll-threshold-local=600"
-
 # build
 RUN git clean -xdf \
   && git submodule update --recursive \
   && cmake -S . -B build \
   -DGGML_HIP=ON \
+  -DCMAKE_HIP_FLAGS="-mllvm --amdgpu-unroll-threshold-local=600" \
   -DAMDGPU_TARGETS=gfx1151 \
   -DCMAKE_BUILD_TYPE=Release \
   -DGGML_RPC=ON \
diff --git a/toolboxes/Dockerfile.rocm7-nightlies b/toolboxes/Dockerfile.rocm7-nightlies
index 65c81a7..1e1e598 100644
--- a/toolboxes/Dockerfile.rocm7-nightlies
+++ b/toolboxes/Dockerfile.rocm7-nightlies
@@ -33,8 +33,7 @@ ENV ROCM_PATH=/opt/rocm-7.0 \
   LD_LIBRARY_PATH=/opt/rocm-7.0/lib:/opt/rocm-7.0/lib64:/opt/rocm-7.0/llvm/lib \
   LIBRARY_PATH=/opt/rocm-7.0/lib:/opt/rocm-7.0/lib64 \
   CPATH=/opt/rocm-7.0/include \
-  PKG_CONFIG_PATH=/opt/rocm-7.0/lib/pkgconfig \
-  HIP_CLANG_FLAGS="-mllvm --amdgpu-unroll-threshold-local=600"
+  PKG_CONFIG_PATH=/opt/rocm-7.0/lib/pkgconfig 
 
 RUN printf '%s\n' \
   'export ROCM_PATH=/opt/rocm-7.0' \
@@ -49,7 +48,6 @@ RUN printf '%s\n' \
   'export LIBRARY_PATH="$HIP_LIB_PATH:$ROCM_PATH/lib:$ROCM_PATH/lib64"' \
   'export CPATH="$HIP_INCLUDE_PATH"' \
   'export PKG_CONFIG_PATH="$ROCM_PATH/lib/pkgconfig"' \
-  'export HIP_LLVM_FLAGS="-mllvm --amdgpu-unroll-threshold-local=600"' \
   > /etc/profile.d/rocm.sh \
   && chmod +x /etc/profile.d/rocm.sh \
   && echo 'source /etc/profile.d/rocm.sh' >> /etc/bashrc
@@ -63,6 +61,7 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
 
 RUN cmake -S . -B build \
   -DGGML_HIP=ON \
+  -DCMAKE_HIP_FLAGS="-mllvm --amdgpu-unroll-threshold-local=600" \
   -DAMDGPU_TARGETS=gfx1151 \
   -DCMAKE_BUILD_TYPE=Release \
   -DGGML_RPC=ON \