Skip to content

Commit

Permalink
Merge with master and resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
TomTheBear committed Nov 9, 2019
2 parents 699ba6c + 8be6dc6 commit c58e8a3
Show file tree
Hide file tree
Showing 620 changed files with 45,296 additions and 22,672 deletions.
91 changes: 78 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,24 @@ OBJ := $(filter-out $(BUILD_DIR)/nvmon.o,$(OBJ))
OBJ := $(filter-out $(BUILD_DIR)/topology_gpu.o,$(OBJ))
OBJ := $(filter-out $(BUILD_DIR)/libnvctr.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)
OBJ_GOTCHA = $(wildcard ./ext/GOTCHA/$(COMPILER)/*.o)
FILTERS := $(filter-out ./filters/README,$(wildcard ./filters/*))


Expand All @@ -118,12 +133,12 @@ endif
CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(INCLUDES)

ifeq ($(BUILDDAEMON),false)
all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF) $(PINLIB) $(L_APPS) $(L_HELPER) $(FREQ_TARGET) $(BENCH_TARGET)
all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF) $(PINLIB) $(L_APPS) $(L_HELPER) $(FREQ_TARGET) $(BENCH_TARGET) $(APPDAEMON_TARGET)
else
ifeq ($(BUILDFREQ),false)
all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF) $(PINLIB) $(L_APPS) $(L_HELPER) $(DAEMON_TARGET) $(BENCH_TARGET)
all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF) $(PINLIB) $(L_APPS) $(L_HELPER) $(DAEMON_TARGET) $(BENCH_TARGET) $(APPDAEMON_TARGET)
else
all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF) $(PINLIB) $(L_APPS) $(L_HELPER) $(DAEMON_TARGET) $(FREQ_TARGET) $(BENCH_TARGET)
all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF) $(PINLIB) $(L_APPS) $(L_HELPER) $(DAEMON_TARGET) $(FREQ_TARGET) $(BENCH_TARGET) $(APPDAEMON_TARGET)
endif
endif

Expand Down Expand Up @@ -185,10 +200,14 @@ $(DAEMON_TARGET): $(SRC_DIR)/access-daemon/accessDaemon.c
@echo "===> BUILD access daemon likwid-accessD"
$(Q)$(MAKE) -C $(SRC_DIR)/access-daemon likwid-accessD

$(FREQ_TARGET): $(SRC_DIR)/access-daemon/setFreq.c
$(FREQ_TARGET): $(SRC_DIR)/access-daemon/setFreqDaemon.c
@echo "===> BUILD frequency daemon likwid-setFreq"
$(Q)$(MAKE) -C $(SRC_DIR)/access-daemon likwid-setFreq

$(APPDAEMON_TARGET): $(SRC_DIR)/access-daemon/appDaemon.c $(TARGET_GOTCHA_LIB)
@echo "===> BUILD application interface likwid-appDaemon.so"
$(Q)$(MAKE) -C $(SRC_DIR)/access-daemon likwid-appDaemon.so

$(BUILD_DIR):
@mkdir $(BUILD_DIR)

Expand All @@ -215,6 +234,11 @@ $(TARGET_LUA_LIB):
@echo "===> EXTERNAL LUA"
endif

$(TARGET_GOTCHA_LIB):
@echo "===> ENTER $(GOTCHA_FOLDER)"
$(Q)$(MAKE) --no-print-directory -C $(GOTCHA_FOLDER) $(MAKECMDGOALS)


$(TARGET_HWLOC_LIB):
@echo "===> ENTER $(HWLOC_FOLDER)"
$(Q)$(MAKE) --no-print-directory -C $(HWLOC_FOLDER) $(MAKECMDGOALS)
Expand Down Expand Up @@ -248,13 +272,13 @@ ifeq ($(findstring $(MAKECMDGOALS),clean),)
-include $(OBJ:.o=.d)
endif

.PHONY: clean distclean install uninstall help $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
.PHONY: clean distclean install uninstall help $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(TARGET_GOTCHA_LIB) $(BENCH_TARGET)

.PRECIOUS: $(BUILD_DIR)/%.pas

.NOTPARALLEL:

clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(TARGET_GOTCHA_LIB) $(BENCH_TARGET)
@echo "===> CLEAN"
@for APP in $(L_APPS); do \
rm -f $$APP; \
Expand All @@ -264,10 +288,10 @@ clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
@rm -f $(DYNAMIC_TARGET_LIB)*
@rm -f $(PINLIB)*
@rm -f $(FORTRAN_IF_NAME)
@rm -f $(FREQ_TARGET) $(DAEMON_TARGET)
@rm -f $(FREQ_TARGET) $(DAEMON_TARGET) $(APPDAEMON_TARGET)
@rm -f likwid-config.cmake

distclean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
distclean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(TARGET_GOTCHA_LIB) $(BENCH_TARGET)
@echo "===> DIST CLEAN"
@for APP in $(L_APPS); do \
rm -f $$APP; \
Expand All @@ -277,10 +301,11 @@ distclean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
@rm -f $(DYNAMIC_TARGET_LIB)*
@rm -f $(PINLIB)*
@rm -f $(FORTRAN_IF_NAME)
@rm -f $(FREQ_TARGET) $(DAEMON_TARGET)
@rm -f $(FREQ_TARGET) $(DAEMON_TARGET) $(APPDAEMON_TARGET)
@rm -rf $(BUILD_DIR)
@rm -rf $(TARGET_LUA_LIB).* $(shell basename $(TARGET_LUA_LIB)).*
@rm -rf $(TARGET_HWLOC_LIB).* $(shell basename $(TARGET_HWLOC_LIB)).*
@rm -rf $(TARGET_GOTCHA_LIB).* $(shell basename $(TARGET_GOTCHA_LIB)).*
@rm -f $(GENGROUPLOCK)
@rm -f likwid-config.cmake
@rm -rf doc/html
Expand Down Expand Up @@ -360,7 +385,33 @@ uninstall_freq_moved:
@echo "===> No UNINSTALL of setFrequencies tool"
endif

install: install_daemon install_freq
ifeq ($(BUILDAPPDAEMON),true)
install_appdaemon:
@echo "===> INSTALL application interface appDaemon to $(PREFIX)/lib/$(APPDAEMON_TARGET)"
@mkdir -p $(PREFIX)/lib
@install -m 755 $(INSTALL_CHOWN) $(APPDAEMON_TARGET) $(PREFIX)/lib/$(APPDAEMON_TARGET)
move_appdaemon:
@echo "===> MOVE application interface appDaemon from $(PREFIX)/lib/$(APPDAEMON_TARGET) to $(INSTALLED_PREFIX)/lib/$(APPDAEMON_TARGET)"
@mkdir -p $(INSTALLED_PREFIX)/lib
@install -m 755 $(INSTALL_CHOWN) $(PREFIX)/lib/$(APPDAEMON_TARGET) $(INSTALLED_PREFIX)/lib/$(APPDAEMON_TARGET)
uninstall_appdaemon:
@echo "===> REMOVING application interface appDaemon from $(PREFIX)/lib/$(APPDAEMON_TARGET)"
@rm -f $(PREFIX)/lib/$(APPDAEMON_TARGET)
uninstall_appdaemon_moved:
@echo "===> REMOVING application interface appDaemon from $(INSTALLED_PREFIX)/lib/$(APPDAEMON_TARGET)"
@rm -f $(INSTALLED_PREFIX)/lib/$(APPDAEMON_TARGET)
else
install_appdaemon:
@echo "===> No INSTALL of the application interface appDaemon"
move_appdaemon:
@echo "===> No MOVE of the application interface appDaemon"
uninstall_appdaemon:
@echo "===> No UNINSTALL of the application interface appDaemon"
uninstall_appdaemon_moved:
@echo "===> No UNINSTALL of the application interface appDaemon"
endif

install: install_daemon install_freq install_appdaemon
@echo "===> INSTALL applications to $(BINPREFIX)"
@mkdir -p $(BINPREFIX)
@chmod 755 $(BINPREFIX)
Expand Down Expand Up @@ -388,6 +439,7 @@ install: install_daemon install_freq
@if [ "$(LUA_INTERNAL)" = "true" ]; then \
install -m 755 $(TARGET_LUA_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE); \
fi
@install -m 755 $(GOTCHA_FOLDER)/$(TARGET_GOTCHA_LIB) $(LIBPREFIX)/$(TARGET_GOTCHA_LIB).$(VERSION).$(RELEASE)
@cd $(LIBPREFIX) && ln -fs $(TARGET_LIB).$(VERSION).$(RELEASE) $(TARGET_LIB)
@cd $(LIBPREFIX) && ln -fs $(TARGET_LIB).$(VERSION).$(RELEASE) $(TARGET_LIB).$(VERSION)
@cd $(LIBPREFIX) && ln -fs $(PINLIB).$(VERSION).$(RELEASE) $(PINLIB)
Expand All @@ -398,6 +450,8 @@ install: install_daemon install_freq
cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_LUA_LIB)); \
cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_LUA_LIB)).$(VERSION); \
fi
@cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_GOTCHA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_GOTCHA_LIB))
@cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_GOTCHA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_GOTCHA_LIB)).$(VERSION)
@echo "===> INSTALL man pages to $(MANPREFIX)/man1"
@mkdir -p $(MANPREFIX)/man1
@chmod 755 $(MANPREFIX)/man1
Expand All @@ -421,6 +475,7 @@ install: install_daemon install_freq
@mkdir -p $(PREFIX)/include
@chmod 755 $(PREFIX)/include
@install -m 644 src/includes/likwid.h $(PREFIX)/include/
@install -m 644 src/includes/likwid-marker.h $(PREFIX)/include/
@install -m 644 src/includes/bstrlib.h $(PREFIX)/include/
$(FORTRAN_INSTALL)
@echo "===> INSTALL groups to $(PREFIX)/share/likwid/perfgroups"
Expand All @@ -445,7 +500,7 @@ install: install_daemon install_freq
done
@install -m 644 likwid-config.cmake $(LIBPREFIX)

move: move_daemon move_freq
move: move_daemon move_freq move_appdaemon
@echo "===> MOVE applications from $(BINPREFIX) to $(INSTALLED_BINPREFIX)"
@mkdir -p $(INSTALLED_BINPREFIX)
@chmod 755 $(INSTALLED_BINPREFIX)
Expand All @@ -469,6 +524,7 @@ move: move_daemon move_freq
@install -m 755 $(LIBPREFIX)/$(PINLIB).$(VERSION).$(RELEASE) $(INSTALLED_LIBPREFIX)/$(PINLIB).$(VERSION).$(RELEASE)
@install -m 755 $(LIBPREFIX)/$(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE) $(INSTALLED_LIBPREFIX)/$(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE)
@install -m 755 $(LIBPREFIX)/$(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE) $(INSTALLED_LIBPREFIX)/$(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE)
@install -m 755 $(LIBPREFIX)/$(shell basename $(TARGET_GOTCHA_LIB)).$(VERSION).$(RELEASE) $(INSTALLED_LIBPREFIX)/$(shell basename $(TARGET_GOTCHA_LIB)).$(VERSION).$(RELEASE)
@cd $(INSTALLED_LIBPREFIX) && ln -fs $(TARGET_LIB).$(VERSION).$(RELEASE) $(TARGET_LIB)
@cd $(INSTALLED_LIBPREFIX) && ln -fs $(TARGET_LIB).$(VERSION).$(RELEASE) $(TARGET_LIB).$(VERSION)
@cd $(INSTALLED_LIBPREFIX) && ln -fs $(PINLIB).$(VERSION).$(RELEASE) $(PINLIB)
Expand All @@ -477,6 +533,8 @@ move: move_daemon move_freq
@cd $(INSTALLED_LIBPREFIX) && ln -fs $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION)
@cd $(INSTALLED_LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_LUA_LIB))
@cd $(INSTALLED_LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_LUA_LIB)).$(VERSION)
@cd $(INSTALLED_LIBPREFIX) && ln -fs $(shell basename $(TARGET_GOTCHA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_GOTCHA_LIB))
@cd $(INSTALLED_LIBPREFIX) && ln -fs $(shell basename $(TARGET_GOTCHA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_GOTCHA_LIB)).$(VERSION)
@echo "===> MOVE man pages from $(MANPREFIX)/man1 to $(INSTALLED_MANPREFIX)/man1"
@mkdir -p $(INSTALLED_MANPREFIX)/man1
@chmod 755 $(INSTALLED_MANPREFIX)/man1
Expand All @@ -485,6 +543,7 @@ move: move_daemon move_freq
@mkdir -p $(INSTALLED_PREFIX)/include
@chmod 755 $(INSTALLED_PREFIX)/include
@install -m 644 $(PREFIX)/include/likwid.h $(INSTALLED_PREFIX)/include/likwid.h
@install -m 644 $(PREFIX)/include/likwid-marker.h $(INSTALLED_PREFIX)/include/likwid-marker.h
@install -m 644 $(PREFIX)/include/bstrlib.h $(INSTALLED_PREFIX)/include/bstrlib.h
@if [ -e $(PREFIX)/include/likwid.mod ]; then install $(PREFIX)/include/likwid.mod $(INSTALLED_PREFIX)/include/likwid.mod; fi
@echo "===> MOVE groups from $(PREFIX)/share/likwid/perfgroups to $(INSTALLED_PREFIX)/share/likwid/perfgroups"
Expand All @@ -507,7 +566,7 @@ move: move_daemon move_freq
@chmod 755 $(LIKWIDFILTERPATH)/*
@install -m 644 $(LIBPREFIX)/likwid-config.cmake $(INSTALLED_LIBPREFIX)

uninstall: uninstall_daemon uninstall_freq
uninstall: uninstall_daemon uninstall_freq uninstall_appdaemon
@echo "===> REMOVING applications from $(PREFIX)/bin"
@rm -f $(addprefix $(BINPREFIX)/,$(addsuffix .lua,$(L_APPS)))
@for APP in $(L_APPS); do \
Expand All @@ -523,6 +582,7 @@ uninstall: uninstall_daemon uninstall_freq
@rm -rf $(PREFIX)/share/lua/likwid.lua
@echo "===> REMOVING libs from $(LIBPREFIX)"
@rm -f $(LIBPREFIX)/liblikwid*
@rm -f $(LIBPREFIX)/$(TARGET_GOTCHA_LIB)
@echo "===> REMOVING man pages from $(MANPREFIX)/man1"
@rm -f $(addprefix $(MANPREFIX)/man1/,$(addsuffix .1,$(L_APPS)))
@rm -f $(MANPREFIX)/man1/feedGnuplot.1
Expand All @@ -532,6 +592,7 @@ uninstall: uninstall_daemon uninstall_freq
@rm -f $(MANPREFIX)/man1/likwid-bench.1
@echo "===> REMOVING header from $(PREFIX)/include"
@rm -f $(PREFIX)/include/likwid.h
@rm -f $(PREFIX)/include/likwid-marker.h
@rm -f $(PREFIX)/include/bstrlib.h
$(FORTRAN_REMOVE)
@echo "===> REMOVING filter, groups and default configs from $(PREFIX)/share/likwid"
Expand All @@ -542,7 +603,7 @@ uninstall: uninstall_daemon uninstall_freq
@rm -rf $(PREFIX)/share/likwid
@rm -rf $(LIBPREFIX)/likwid-config.cmake

uninstall_moved: uninstall_daemon_moved uninstall_freq_moved
uninstall_moved: uninstall_daemon_moved uninstall_freq_moved uninstall_appdaemon_moved
@echo "===> REMOVING applications from $(INSTALLED_PREFIX)/bin"
@rm -f $(addprefix $(INSTALLED_BINPREFIX)/,$(addsuffix .lua,$(L_APPS)))
@for APP in $(L_APPS); do \
Expand All @@ -558,6 +619,7 @@ uninstall_moved: uninstall_daemon_moved uninstall_freq_moved
@rm -rf $(INSTALLED_PREFIX)/share/lua/likwid.lua
@echo "===> REMOVING libs from $(INSTALLED_LIBPREFIX)"
@rm -f $(INSTALLED_LIBPREFIX)/liblikwid*
@rm -f $(INSTALLED_LIBPREFIX)/$(TARGET_GOTCHA_LIB)
@echo "===> REMOVING man pages from $(INSTALLED_MANPREFIX)/man1"
@rm -f $(addprefix $(INSTALLED_MANPREFIX)/man1/,$(addsuffix .1,$(L_APPS)))
@rm -f $(INSTALLED_MANPREFIX)/man1/feedGnuplot.1
Expand All @@ -567,6 +629,7 @@ uninstall_moved: uninstall_daemon_moved uninstall_freq_moved
@rm -f $(INSTALLED_MANPREFIX)/man1/likwid-bench.1
@echo "===> REMOVING header from $(INSTALLED_PREFIX)/include"
@rm -f $(INSTALLED_PREFIX)/include/likwid.h
@rm -f $(PREFIX)/include/likwid-marker.h
@rm -f $(INSTALLED_PREFIX)/include/bstrlib.h
$(FORTRAN_REMOVE)
@echo "===> REMOVING filter, groups and default configs from $(INSTALLED_PREFIX)/share/likwid"
Expand All @@ -591,6 +654,8 @@ local: $(L_APPS) likwid.lua
@ln -sf $(HWLOC_FOLDER)/liblikwid-hwloc.so liblikwid-hwloc.so.$(VERSION).$(RELEASE)
@ln -sf $(LUA_FOLDER)/liblikwid-lua.so liblikwid-lua.so.$(VERSION)
@ln -sf $(LUA_FOLDER)/liblikwid-lua.so liblikwid-lua.so.$(VERSION).$(RELEASE)
@ln -sf $(GOTCHA_FOLDER)/liblikwid-gotcha.so liblikwid-gotcha.so.$(VERSION)
@ln -sf $(GOTCHA_FOLDER)/liblikwid-gotcha.so liblikwid-gotcha.so.$(VERSION).$(RELEASE)
@if [ -e $(LUA_FOLDER)/liblikwid-lua.so ]; then ln -sf $(LUA_FOLDER)/liblikwid-lua.so liblikwid-lua.so.$(VERSION).$(RELEASE); fi
@if [ -e $(HWLOC_FOLDER)/liblikwid-hwloc.so ]; then ln -sf $(HWLOC_FOLDER)/liblikwid-hwloc.so liblikwid-hwloc.so.$(VERSION).$(RELEASE); fi
@if [ -e $(PINLIB) ]; then ln -sf $(PINLIB) $(PINLIB).$(VERSION).$(RELEASE); fi
Expand Down
18 changes: 13 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ Introduction
--------------------------------------------------------------------------------

Likwid is a simple to install and use toolsuite of command line applications
for performance oriented programmers. It works for Intel, AMD and ARMv8 processors
on the Linux operating system.
for performance oriented programmers. It works for Intel, AMD, ARMv8 and POWER9
processors on the Linux operating system. There is support for ARMv7 and POWER8
but there is currently no test machine in our hands to test them properly.

[![Build Status](https://travis-ci.org/RRZE-HPC/likwid.svg?branch=master)](https://travis-ci.org/RRZE-HPC/likwid)

Expand Down Expand Up @@ -61,9 +62,16 @@ AMD
- AMD Interlagos
- AMD Kabini
- AMD Zen
- AMD Zen2

ARMv8 (experimental)
- Tested on Marvell Thunder X2
ARM (experimental)
- ARMv7
- ARMv8
- Special support for Marvell Thunder X2

POWER (experimental)
- IBM POWER8
- IBM POWER9

--------------------------------------------------------------------------------
Download, Build and Install
Expand Down Expand Up @@ -105,7 +113,7 @@ https://github.com/rrze-likwid/likwid/issues
Extras
--------------------------------------------------------------------------------
- If you want to use the Marker API with Java, you can find the Java module here:
https://github.com/jlewandowski/likwid-java-api
https://github.com/jacek-lewandowski/likwid-java-api
- For Python you can find an interface to the LIKWID API here:
https://github.com/RRZE-HPC/pylikwid or `pip install pylikwid`

Expand Down
3 changes: 3 additions & 0 deletions bench/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ endif
ifeq ($(COMPILER),GCCARMv8)
BENCH_DIR = ./armv8
endif
ifeq ($(COMPILER),GCCPOWER)
BENCH_DIR = ./power
endif



Expand Down
15 changes: 15 additions & 0 deletions bench/armv8/daxpy.ptt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
STREAMS 2
TYPE DOUBLE
FLOPS 2
BYTES 24
DESC Double-precision linear combination of two vectors, only scalar operations
LOADS 2
STORES 1
INSTR_LOOP 4
fmov FPR7, ARG1
LOOP 1
ldr FPR1, [STR0], #8
fmul FPR1, FPR1, FPR7
ldr FPR2, [STR1]
fadd FPR1, FPR1, FPR2
str FPR1, [STR1], #8
16 changes: 16 additions & 0 deletions bench/armv8/triad.ptt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
STREAMS 4
TYPE DOUBLE
FLOPS 2
BYTES 32
DESC Double-precision triad A(i) = B(i) * C(i) + D(i), only scalar operations
LOADS 3
STORES 1
INSTR_LOOP 6
LOOP 1
ldr D1, [STR1], #8
ldr D2, [STR2], #8
ldr D3, [STR3], #8
fmul D1, D1, D2
fadd D1, D1, D3
str D1, [STR0], #8

3 changes: 2 additions & 1 deletion bench/includes/allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ extern void allocator_allocateVector(void** ptr,
int offset,
DataType type,
int stride,
bstring domain);
bstring domain,
int init_per_thread);

#endif /*ALLOCATOR_H*/
1 change: 1 addition & 0 deletions bench/includes/bstrlib_helper.h
Loading

0 comments on commit c58e8a3

Please sign in to comment.