These changes should go later in another commit - lets keep this HSA only

src/common/uarch.hpp

@@ -31,6 +31,4 @@ struct uarch {
   char* chip_str;
 };
 
-char* get_str_process(struct uarch* arch);
-
 #endif

src/cuda/uarch.cpp

@@ -5,10 +5,10 @@
 #include <cstdio>
 #include <cstring>
 
+#include "../common/uarch.hpp"
 #include "../common/global.hpp"
 #include "../common/gpu.hpp"
 #include "chips.hpp"
-#include "uarch.hpp"
 
 // Any clock multiplier
 #define CM_ANY               -1

src/cuda/uarch.hpp

@@ -2,7 +2,6 @@
 #define __CUDA_UARCH__
 
 #include "../common/gpu.hpp"
-#include "../common/uarch.hpp"
 
 struct uarch;
 
@@ -12,6 +11,7 @@ MEMTYPE guess_memtype_from_cmul_and_uarch(int ddr, struct uarch* arch);
 char* get_str_uarch_cuda(struct uarch* arch);
 char* get_str_cc(struct uarch* arch);
 char* get_str_chip(struct uarch* arch);
+char* get_str_process(struct uarch* arch);
 void free_uarch_struct(struct uarch* arch);
 
 #endif

src/hsa/uarch.cpp

@@ -2,9 +2,9 @@
 #include <cstdint>
 #include <cstring>
 
+#include "../common/uarch.hpp"
 #include "../common/global.hpp"
 #include "../common/gpu.hpp"
-#include "uarch.hpp"
 #include "chips.hpp"
 
 // MICROARCH values

src/hsa/uarch.hpp

@@ -2,11 +2,11 @@
 #define __HSA_UARCH__
 
 #include "../common/gpu.hpp"
-#include "../common/uarch.hpp"
 
 struct uarch;
 
 struct uarch* get_uarch_from_hsa(struct gpu_info* gpu, char* gpu_name);
 char* get_str_uarch_hsa(struct uarch* arch);
+char* get_str_process(struct uarch* arch); // TODO: Shouldnt we define this in the cpp?
 
 #endif

src/intel/uarch.cpp

@@ -3,12 +3,12 @@
 #include <cstring>
 #include <cstdio>
 
+#include "../common/uarch.hpp"
 #include "../common/global.hpp"
 #include "../common/gpu.hpp"
 #include "chips.hpp"
 #include "pci.hpp"
 #include "cpuid.hpp"
-#include "uarch.hpp"
 
 // Data not available
 #define NA                   -1

src/intel/uarch.hpp

@@ -2,7 +2,6 @@
 #define __INTEL_UARCH__
 
 #include "../common/gpu.hpp"
-#include "../common/uarch.hpp"
 
 struct uarch;