From 73303ca2d26658bb41a63224fea5a41545753fad Mon Sep 17 00:00:00 2001
From: Brandon Potter <brandon.potter@amd.com>
Date: Tue, 30 Jul 2024 12:56:32 -0500
Subject: [PATCH] Move inline assembly into arch defines blocks

---
 src/reverse_offload/context_ro_device.cpp |  8 ++++--
 src/util.cpp                              |  2 ++
 src/util.hpp                              | 30 ++++++++++++++++++++---
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/reverse_offload/context_ro_device.cpp b/src/reverse_offload/context_ro_device.cpp
index 6182ce0917..6c6ea8f809 100644
--- a/src/reverse_offload/context_ro_device.cpp
+++ b/src/reverse_offload/context_ro_device.cpp
@@ -391,20 +391,24 @@ __device__ bool enough_space(BlockHandle *h, uint64_t required) {
 
 __device__ void refresh_volatile_dwordx2(volatile uint64_t *assigned_value,
                                          volatile uint64_t *read_value) {
-  __asm__ volatile(
+#if __gfx90a__
+  asm volatile(
     "global_load_dwordx2 %0 %1 off glc slc\n "
     "s_waitcnt vmcnt(0)"
     : "=v"(*assigned_value)
     : "v"(read_value));
+#endif
 }
 
 __device__ void refresh_volatile_sbyte(volatile int *assigned_value,
                                        volatile char *read_value) {
-  __asm__ volatile(
+#if __gfx90a__
+  asm volatile(
     "global_load_sbyte %0 %1 off glc slc\n "
     "s_waitcnt vmcnt(0)"
     : "=v"(*assigned_value)
     : "v"(read_value));
+#endif
 }
 
 __device__ void acquire_lock(BlockHandle *handle) {
diff --git a/src/util.cpp b/src/util.cpp
index 11122d7b16..c68bfc55c1 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -42,10 +42,12 @@ std::vector<device_agent_t> cpu_agents;
 
 __device__ uint64_t __read_clock() {
   uint64_t clock{};
+#if __gfx90a__
   asm volatile(
       "s_memrealtime %0\n"
       "s_waitcnt lgkmcnt(0)\n"
       : "=s"(clock));
+#endif
   return clock;
 }
 
diff --git a/src/util.hpp b/src/util.hpp
index 1d5cd9f9a6..1fa9330509 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -43,11 +43,13 @@ namespace rocshmem {
 
 __device__ __forceinline__ int uncached_load_ubyte(uint8_t* src) {
   int ret;
-  __asm__ volatile(
+#if __gfx90a__
+  asm volatile(
       "global_load_ubyte %0 %1 off glc slc \n"
       "s_waitcnt vmcnt(0)"
       : "=v"(ret)
       : "v"(src));
+#endif
   return ret;
 }
 
@@ -62,18 +64,22 @@ NOWARN(-Wdeprecated-volatile,
     T ret;
     switch (sizeof(T)) {
       case 4:
-        __asm__ volatile(
+#if __gfx90a__
+        asm volatile(
             "global_load_dword %0 %1 off glc slc \n"
             "s_waitcnt vmcnt(0)"
             : "=v"(ret)
             : "v"(src));
+#endif
         break;
       case 8:
-        __asm__ volatile(
+#if __gfx90a__
+        asm volatile(
             "global_load_dwordx2 %0 %1 off glc slc \n"
             "s_waitcnt vmcnt(0)"
             : "=v"(ret)
             : "v"(src));
+#endif
         break;
       default:
         break;
@@ -123,7 +129,13 @@ NOWARN(-Wdeprecated-volatile,
 extern const int gpu_clock_freq_mhz;
 
 /* Device-side internal functions */
-__device__ __forceinline__ void __roc_inv() { asm volatile("buffer_wbinvl1;"); }
+__device__ __forceinline__ void __roc_inv() {
+#if defined USE_COHERENT_HEAP
+#if __gfx90a__
+  asm volatile("buffer_wbinvl1;");
+#endif
+#endif
+}
 
 __device__ __forceinline__ void __roc_flush() {
 #if defined USE_COHERENT_HEAP
@@ -131,6 +143,10 @@ __device__ __forceinline__ void __roc_flush() {
   asm volatile("s_dcache_wb;");
   asm volatile("buffer_wbl2;");
 #endif
+#if __gfx90a__
+  asm volatile("s_dcache_wb;");
+  asm volatile("buffer_wbl2;");
+#endif
 #endif
 }
 
@@ -227,17 +243,23 @@ __device__ __forceinline__ void store_asm(uint8_t* val, uint8_t* dst,
   switch (size) {
     case 2: {
       int16_t val16{*(reinterpret_cast<int16_t*>(val))};
+#if __gfx90a__
       asm volatile("flat_store_short %0 %1 glc slc" : : "v"(dst), "v"(val16));
+#endif
       break;
     }
     case 4: {
       int32_t val32{*(reinterpret_cast<int32_t*>(val))};
+#if __gfx90a__
       asm volatile("flat_store_dword %0 %1 glc slc" : : "v"(dst), "v"(val32));
+#endif
       break;
     }
     case 8: {
       int64_t val64{*(reinterpret_cast<int64_t*>(val))};
+#if __gfx90a__
       asm volatile("flat_store_dwordx2 %0 %1 glc slc" : : "v"(dst), "v"(val64));
+#endif
       break;
     }
     default: