From c5e3b19687136179277333c397c8f0df4761a071 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Fri, 27 Jan 2023 15:31:15 +0100
Subject: [PATCH 1/6] [BuildRules] First implementation of RocM build rules

---
 scram-project-build.file | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index fa956acce9b..236d3842e22 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -54,7 +54,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V07-03-18
+%define configtag       V07-04-00
 %endif
 
 %if "%{?cvssrc:set}" != "set"

From 5be4026d3bffff2dc3f6fbcb8bbdfeb0f0cd1f6a Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Fri, 27 Jan 2023 23:15:26 +0100
Subject: [PATCH 2/6] Update scram-project-build.file

---
 scram-project-build.file | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index 236d3842e22..363e47dfa48 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -54,7 +54,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V07-04-00
+%define configtag       V07-04-01
 %endif
 
 %if "%{?cvssrc:set}" != "set"

From 4242bb039bd06a3ca82816e9bd09417ba29a9d6d Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Sat, 28 Jan 2023 10:42:08 +0100
Subject: [PATCH 3/6] use llvm compiler flags for for rocm

---
 scram-project-build.file | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index 363e47dfa48..0705cf62625 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -54,7 +54,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V07-04-01
+%define configtag       V07-04-02
 %endif
 
 %if "%{?cvssrc:set}" != "set"

From 182825d3cefd9dfe68249eab5422f7bbb462aa15 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Sat, 28 Jan 2023 10:56:35 +0100
Subject: [PATCH 4/6] rocm rules use llvm flags so no need to duplicate these
 REM_CXXFLAGS

---
 scram-tools.file/tools/rocm/rocm.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml
index 92d6cf7dd4b..1ef1d7ca19b 100644
--- a/scram-tools.file/tools/rocm/rocm.xml
+++ b/scram-tools.file/tools/rocm/rocm.xml
@@ -15,18 +15,6 @@
   </client>
   <flags CPPDEFINES="__HIP_PLATFORM_HCC__ __HIP_PLATFORM_AMD__"/>
   <flags ROCM_FLAGS="-fgpu-rdc --offload-arch=gfx900 --target=@COMPILER_HOST@ --gcc-toolchain=$(COMPILER_PATH)"/>
-  <!-- REM_CXXFLAGS from llvm/llvm-cxxcompiler.xml -->
-  <flags ROCM_HOST_REM_CXXFLAGS="-Wno-non-template-friend"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-Werror=format-contains-nul"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-Werror=maybe-uninitialized"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-Werror=unused-but-set-variable"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-Werror=return-local-addr"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-fipa-pta"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-frounding-math"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-mrecip"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-fno-crossjumping"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-fno-aggressive-loop-optimizations"/>
-  <flags ROCM_HOST_REM_CXXFLAGS="-funroll-all-loops"/>
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path" join="1"/>
   <runtime name="PATH" value="$ROCM_BASE/bin" type="path"/>
 </tool>

From 6dbb4e18c3a82b36e8d55a38a8a79cb9e303d86f Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Sat, 28 Jan 2023 11:04:46 +0100
Subject: [PATCH 5/6] hip/lib abd hsa/lib are already part of default lib

---
 scram-tools.file/tools/rocm/rocm.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml
index 1ef1d7ca19b..91e9a5c7c02 100644
--- a/scram-tools.file/tools/rocm/rocm.xml
+++ b/scram-tools.file/tools/rocm/rocm.xml
@@ -7,8 +7,6 @@
     <environment name="BINDIR"    default="$ROCM_BASE/bin"/>
     <environment name="LIBDIR"    default="$ROCM_BASE/lib"/>
     <environment name="LIBDIR"    default="$ROCM_BASE/lib64"/>
-    <environment name="LIBDIR"    default="$ROCM_BASE/hip/lib"/>
-    <environment name="LIBDIR"    default="$ROCM_BASE/hsa/lib"/>
     <environment name="INCLUDE"   default="$ROCM_BASE/include"/>
     <environment name="INCLUDE"   default="$ROCM_BASE/hip/include"/>
     <environment name="INCLUDE"   default="$ROCM_BASE/hsa/include"/>

From 41ddb8695f94afdb5b15ca1809db7b6c8aa36529 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Sat, 28 Jan 2023 22:47:20 +0100
Subject: [PATCH 6/6] hip/hsa includes are also available via main include path

---
 scram-tools.file/tools/rocm/rocm.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml
index 91e9a5c7c02..f644db83482 100644
--- a/scram-tools.file/tools/rocm/rocm.xml
+++ b/scram-tools.file/tools/rocm/rocm.xml
@@ -8,8 +8,6 @@
     <environment name="LIBDIR"    default="$ROCM_BASE/lib"/>
     <environment name="LIBDIR"    default="$ROCM_BASE/lib64"/>
     <environment name="INCLUDE"   default="$ROCM_BASE/include"/>
-    <environment name="INCLUDE"   default="$ROCM_BASE/hip/include"/>
-    <environment name="INCLUDE"   default="$ROCM_BASE/hsa/include"/>
   </client>
   <flags CPPDEFINES="__HIP_PLATFORM_HCC__ __HIP_PLATFORM_AMD__"/>
   <flags ROCM_FLAGS="-fgpu-rdc --offload-arch=gfx900 --target=@COMPILER_HOST@ --gcc-toolchain=$(COMPILER_PATH)"/>