Merge pull request RRZE-HPC#217 from RRZE-HPC/unstable-power9

LIKWID support for POWER8 and POWER9 systems
breiters · Nov 9, 2019 · 283f72f · 283f72f
2 parents 87ad0ff + 4646755
commit 283f72f
Show file tree

Hide file tree

Showing 104 changed files with 8,783 additions and 267 deletions.
diff --git a/Makefile b/Makefile
@@ -89,6 +89,20 @@ OBJ := $(filter-out $(BUILD_DIR)/access_x86_pci.o,$(OBJ))
 else
 OBJ := $(filter-out $(BUILD_DIR)/loadDataARM.o,$(OBJ))
 endif
+ifeq ($(COMPILER),GCCPOWER)
+OBJ := $(filter-out $(BUILD_DIR)/topology_cpuid.o,$(OBJ))
+OBJ := $(filter-out $(BUILD_DIR)/access_x86.o,$(OBJ))
+OBJ := $(filter-out $(BUILD_DIR)/access_x86_msr.o,$(OBJ))
+OBJ := $(filter-out $(BUILD_DIR)/access_x86_pci.o,$(OBJ))
+OBJ := $(filter-out $(BUILD_DIR)/loadData.o,$(OBJ))
+endif
+ifeq ($(COMPILER),XLC)
+OBJ := $(filter-out $(BUILD_DIR)/topology_cpuid.o,$(OBJ))
+OBJ := $(filter-out $(BUILD_DIR)/access_x86.o,$(OBJ))
+OBJ := $(filter-out $(BUILD_DIR)/access_x86_msr.o,$(OBJ))
+OBJ := $(filter-out $(BUILD_DIR)/access_x86_pci.o,$(OBJ))
+OBJ := $(filter-out $(BUILD_DIR)/loadData.o,$(OBJ))
+endif
 PERFMONHEADERS  = $(patsubst $(SRC_DIR)/includes/%.txt, $(BUILD_DIR)/%.h,$(wildcard $(SRC_DIR)/includes/*.txt))
 OBJ_LUA    =  $(wildcard ./ext/lua/$(COMPILER)/*.o)
 OBJ_HWLOC  =  $(wildcard ./ext/hwloc/$(COMPILER)/*.o)

diff --git a/bench/Makefile b/bench/Makefile
@@ -63,6 +63,9 @@ endif
 ifeq ($(COMPILER),GCCARMv8)
 BENCH_DIR   = ./armv8
 endif
+ifeq ($(COMPILER),GCCPOWER)
+BENCH_DIR   = ./power
+endif
 
 
 

diff --git a/bench/likwid-bench.c b/bench/likwid-bench.c
@@ -160,7 +160,11 @@ int main(int argc, char** argv)
     binsertch(HLINE, 0, 80, '-');
     binsertch(HLINE, 80, 1, '\n');
     int (*ownprintf)(const char *format, ...);
+#ifdef _ARCH_PPC
+    int clsize = 128;
+#else
     int clsize = sysconf (_SC_LEVEL1_DCACHE_LINESIZE);
+#endif
     char compilers[512] = "gcc,icc,pgcc";
     char defcompilepath[512] = "/tmp";
     char compilepath[513] = "";
@@ -453,6 +457,7 @@ int main(int argc, char** argv)
                 size_t newsize = 0;
                 size_t stride = test->stride;
                 int nrThreads = currentWorkgroup->numberOfThreads;
+                int clsize = 128;
                 size_t orig_size = currentWorkgroup->size;
                 if (i == 0)
                 {

diff --git a/bench/perl/AsmGen.pl b/bench/perl/AsmGen.pl
@@ -198,7 +198,7 @@ END
 | LOOP SYMBOL INUMBER SREG block
 {[
 {FUNC => 'as::loop_entry',
- ARGS => [$item{SYMBOL}[1],$item{SREG}[1]]},
+ ARGS => [$item{SYMBOL}[1],$item{INUMBER}[1][1]]},
  $item{block},
 {FUNC => 'as::loop_exit',
  ARGS => [$item{SYMBOL}[1],$item{INUMBER}[1][1]]}