RRZE-HPC · ipatix · Nov 26, 2024 · Nov 21, 2024 · Nov 25, 2024 · Nov 25, 2024
diff --git a/Makefile b/Makefile
diff --git a/bench/Makefile b/bench/Makefile
@@ -105,40 +105,46 @@ OBJ := $(filter-out $(BUILD_DIR)/bstrlib.o,$(OBJ))
 TARGET_LIB = $(STATIC_TARGET_LIB)
 LIBS += -ldl
 endif
-OBJ_BENCH  =  $(patsubst $(BENCH_DIR)/%.ptt, $(BUILD_DIR)/%.o,$(wildcard $(BENCH_DIR)/*.ptt))
+PTT_BENCH  =  $(wildcard $(BENCH_DIR)/*.ptt)
+OBJ_BENCH  =  $(patsubst $(BENCH_DIR)/%.ptt, $(BUILD_DIR)/%.o,$(PTT_BENCH))
+PAS_BENCH  =  $(patsubst $(BENCH_DIR)/%.ptt, $(BUILD_DIR)/%.pas,$(PTT_BENCH))
 BENCH = $(shell basename $(BENCH_TARGET))
 
 CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(INCLUDES)
 
-all: $(BUILD_DIR) $(OBJ) $(OBJ_BENCH) $(BENCH_TARGET)
+all: $(BENCH_TARGET)
 
 
 $(BENCH_TARGET): $(BENCH)
-$(BENCH): likwid-bench.c $(BUILD_DIR) $(OBJ) $(OBJ_BENCH)
+$(BENCH): likwid-bench.c $(OBJ) $(OBJ_BENCH)
 	@echo "===>  LINKING  $(BENCH)"
-	$(Q)${CC} $(DEBUG_FLAGS) $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) ${LFLAGS}  likwid-bench.c $(BENCH_LIBS) $(OBJ_BENCH) $(OBJ) -o $(BENCH) $(TARGET_LIB) $(LIBS) $(RPATHS)
-
-
-$(BUILD_DIR):
-	@mkdir $(BUILD_DIR)
-
+	$(Q)$(CC) $(DEBUG_FLAGS) $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) $(LFLAGS) -Wl,-z,noexecstack $^ $(BENCH_LIBS) -o $(BENCH) $(TARGET_LIB) $(LIBS) $(RPATHS)
 
 #PATTERN RULES
 $(BUILD_DIR)/%.o:  %.c
 	@echo "===>  COMPILE C $@"
+	@mkdir -p $(BUILD_DIR)
 	$(Q)$(CC) -g -c $(DEBUG_FLAGS) $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) $< -o $@
 	$(Q)$(CC) -g $(DEBUG_FLAGS) $(CPPFLAGS) -MT $(@:.d=.o) -MM  $< > $(BUILD_DIR)/$*.d
 
 
-$(BUILD_DIR)/%.pas:  $(BENCH_DIR)/%.ptt
+# Note: GEN_PAS can only create *.pas from *.ptt all at once, so build the rule accordingly.
+# The &: operator only works with GNU make 4.3+, so keep backwards compatibility.
+ifneq ($(shell [ "$(MAKE_VERSION)" = "$(echo -e "$(MAKE_VERSION)\n4.3" | sort -V | head -n1)" ] && echo TOO_OLD || echo OK),TOO_OLD)
+$(PAS_BENCH) &: $(PTT_BENCH)
+else
+.NOTPARALLEL: $(PAS_BENCH)
+$(PAS_BENCH) : $(PTT_BENCH)
+endif
 	@echo "===>  GENERATE BENCHMARKS"
+	@mkdir -p $(BUILD_DIR)
 	$(Q)$(GEN_PAS) $(BENCH_DIR) $(BUILD_DIR) ./perl/templates
 
-
 $(BUILD_DIR)/%.o:  $(BUILD_DIR)/%.pas
 	@echo "===>  ASSEMBLE  $@"
-	$(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $<  '$(DEFINES)'
-	$(Q)$(AS) $(ASFLAGS)  $(BUILD_DIR)/$*.s -o $@
+	@mkdir -p $(BUILD_DIR)
+	$(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $< '$(DEFINES)'
+	$(Q)$(AS) $(ASFLAGS) $(BUILD_DIR)/$*.s -o $@
 
 ifeq ($(findstring $(MAKECMDGOALS),clean),)
 -include $(OBJ:.o=.d)
@@ -148,14 +154,13 @@ endif
 
 .PRECIOUS: $(BUILD_DIR)/%.pas
 
-.NOTPARALLEL:
-
 clean:
+	@echo "===>  CLEAN BENCH"
 	@rm -rf likwid-bench
 
-distclean:
+distclean: clean
+	@echo "===>  DIST CLEAN BENCH"
 	@rm -rf $(BUILD_DIR)
-	@rm -rf likwid-bench
 
 install:
 	@echo "===> INSTALL applications to $(BINPREFIX)"

diff --git a/ext/GOTCHA/Makefile b/ext/GOTCHA/Makefile
@@ -69,22 +69,21 @@ CPPFLAGS := $(filter-out -D_GNU_SOURCE,$(CPPFLAGS))
 LIBGOTCHA = $(shell basename $(TARGET_GOTCHA_LIB))
 INTERPRETER = lua
 
-.NOTPARALLEL: all
-
-all: $(BUILD_DIR) $(OBJ)  $(LIBGOTCHA)
-
-$(BUILD_DIR):
-	@mkdir $(BUILD_DIR)
+all: $(LIBGOTCHA)
 
 $(STATIC_LIBGOTCHA): $(OBJ)
 	$(info "GOTCHA cannot be build statically in LIKWID")
+	#@echo "===>  CREATE STATIC LIB  $@"
 	#$(Q)${AR} -cq $(LIBGOTCHA) $(OBJ)
 
 $(SHARED_LIBGOTCHA): $(OBJ)
-	$(Q)$(CC) $(DEBUG_FLAGS) $(LFLAGS) -Wl,-soname,$(LIBGOTCHA).$(VERSION).$(RELEASE) -shared -fPIC -o $(LIBGOTCHA) $(OBJ) $(LIBS)
+	@echo "===>  CREATE SHARED LIB  $@"
+	$(Q)$(CC) $(DEBUG_FLAGS) $(LFLAGS) -Wl,-soname,$(LIBGOTCHA).$(VERSION).$(RELEASE),--no-undefined -shared -fPIC -o $(LIBGOTCHA) $(OBJ) $(LIBS)
 
 #PATTERN RULES
 $(BUILD_DIR)/%.o:  %.c
+	@echo "===>  COMPILE  $@"
+	@mkdir -p $(BUILD_DIR)
 	$(Q)$(CC) -c $(DEBUG_FLAGS) $(CFLAGS) $(CPPFLAGS) $< -o $@
 	$(Q)$(CC) $(DEBUG_FLAGS) $(CPPFLAGS) -MT $(@:.d=.o) -MM  $< > $(BUILD_DIR)/$*.d
 
@@ -95,8 +94,10 @@ endif
 .PHONY: clean distclean
 
 clean:
+	@echo "===>  CLEAN GOTCHA"
 	@rm -f $(TARGET) $(SHARED_LIBGOTCHA) $(STATIC_LIBGOTCHA) $(LIBGOTCHA).$(VERSION).$(RELEASE) $(LIBGOTCHA).$(VERSION)
 
 distclean: clean
+	@echo "===>  DIST CLEAN GOTCHA"
 	@rm -f $(TARGET) $(SHARED_LIBGOTCHA) $(STATIC_LIBGOTCHA) $(LIBGOTCHA).$(VERSION).$(RELEASE) $(LIBGOTCHA).$(VERSION)
 	@rm -rf $(BUILD_DIR)
diff --git a/ext/hwloc/Makefile b/ext/hwloc/Makefile
@@ -61,22 +61,20 @@ endif
 
 CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(INCLUDES)
 
-.NOTPARALLEL: all
-
-all: $(BUILD_DIR) $(OBJ) $(LIBHWLOC)
-
-$(BUILD_DIR):
-	@mkdir $(BUILD_DIR)
-
+all: $(LIBHWLOC)
 
 $(STATIC_LIBHWLOC): $(OBJ)
+	@echo "===>  CREATE STATIC LIB  $@"
 	$(Q)${AR} -cq $(LIBHWLOC) $(OBJ)
 
 $(SHARED_LIBHWLOC): $(OBJ)
-	$(Q)$(CC) $(DEBUG_FLAGS) $(LFLAGS) -Wl,-soname,$(LIBHWLOC).$(VERSION).$(RELEASE)  -Wall -shared -fPIC -o $(LIBHWLOC) $(OBJ) $(LIBS) $(RPATHS)
+	@echo "===>  CREATE SHARED LIB  $@"
+	$(Q)$(CC) $(DEBUG_FLAGS) $(LFLAGS) -Wl,-soname,$(LIBHWLOC).$(VERSION).$(RELEASE),--no-undefined -Wall -shared -fPIC -o $(LIBHWLOC) $^ $(LIBS) $(RPATHS)
 
 #PATTERN RULES
 $(BUILD_DIR)/%.o:  %.c
+	@echo "===>  COMPILE  $@"
+	@mkdir -p $(BUILD_DIR)
 	$(Q)$(CC) -c $(DEBUG_FLAGS) $(CFLAGS) $(CPPFLAGS) $< -o $@
 	$(Q)$(CC) $(DEBUG_FLAGS) $(CPPFLAGS) -MT $(@:.d=.o) -MM  $< > $(BUILD_DIR)/$*.d
 
@@ -87,10 +85,11 @@ endif
 .PHONY: clean distclean
 
 clean:
+	@echo "===>  CLEAN HWLOC"
 	@rm -f $(TARGET) $(SHARED_LIBHWLOC) $(STATIC_LIBHWLOC) $(LIBHWLOC).$(VERSION).$(RELEASE) $(LIBHWLOC).$(VERSION)
 
 distclean: clean
-	@rm -f $(TARGET) $(SHARED_LIBHWLOC) $(STATIC_LIBHWLOC) $(LIBHWLOC).$(VERSION).$(RELEASE) $(LIBHWLOC).$(VERSION)
+	@echo "===>  DIST CLEAN HWLOC"
 	@rm -rf $(BUILD_DIR)
 
 

diff --git a/ext/lua/Makefile b/ext/lua/Makefile
@@ -40,24 +40,24 @@ CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(INCLUDES)
 LIBLUA = $(shell basename $(TARGET_LUA_LIB))
 INTERPRETER = lua
 
-.NOTPARALLEL: all
-
-all: $(BUILD_DIR) $(OBJ)  $(LIBLUA) $(INTERPRETER)
-
-$(BUILD_DIR):
-	@mkdir $(BUILD_DIR)
+all: $(LIBLUA) $(INTERPRETER)
 
 $(STATIC_LIBLUA): $(OBJ)
-	$(Q)${AR} -cq $(LIBLUA) $(OBJ)
+	@echo "===>  CREATE STATIC LIB  $@"
+	$(Q)$(AR) -cq $@ $(OBJ)
 
 $(SHARED_LIBLUA): $(OBJ)
-	$(Q)$(CC) $(DEBUG_FLAGS) $(LFLAGS) -Wl,-soname,$(LIBLUA).$(VERSION).$(RELEASE) -shared -fPIC -o $(LIBLUA) $(OBJ) $(LIBS)
+	@echo "===>  CREATE SHARED LIB  $@"
+	$(Q)$(CC) $(DEBUG_FLAGS) $(LFLAGS) -Wl,-soname,$(LIBLUA).$(VERSION).$(RELEASE),--no-undefined -shared -fPIC -o $@ $(OBJ) $(LIBS)
 
 $(INTERPRETER): $(LIBLUA) $(BUILD_DIR)/lua.o
+	@echo "===>  LINKING  $@"
 	$(Q)$(CC) $(DEBUG_FLAGS) -o $@ $(LFLAGS) $(BUILD_DIR)/lua.o $(RPATHS) $(LIBLUA) $(LIBS)
 
 #PATTERN RULES
 $(BUILD_DIR)/%.o:  %.c
+	@echo "===>  COMPILE  $@"
+	@mkdir -p $(BUILD_DIR)
 	$(Q)$(CC) -c $(DEBUG_FLAGS) $(CFLAGS) $(CPPFLAGS) $< -o $@
 	$(Q)$(CC) $(DEBUG_FLAGS) $(CPPFLAGS) -MT $(@:.d=.o) -MM  $< > $(BUILD_DIR)/$*.d
 
@@ -68,9 +68,11 @@ endif
 .PHONY: clean distclean
 
 clean:
+	@echo "===>  CLEAN LUA"
 	@rm -f $(TARGET) $(INTERPRETER) $(SHARED_LIBLUA) $(STATIC_LIBLUA) $(LIBLUA).$(VERSION).$(RELEASE) $(LIBLUA).$(VERSION)
 
 distclean: clean
+	@echo "===>  DIST CLEAN LUA"
 	@rm -f $(TARGET) $(INTERPRETER) $(SHARED_LIBLUA) $(STATIC_LIBLUA) $(LIBLUA).$(VERSION).$(RELEASE) $(LIBLUA).$(VERSION)
 	@rm -rf $(BUILD_DIR)
 

diff --git a/packaging/deb/package.sh b/packaging/deb/package.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -eu
+
+if [ -z ${FROM_MAKEFILE+1} ]; then
+    echo "$0 is not intended to be run manually. Please run 'make RPM' instead."
+    exit 1
+fi
+
+BASEDIR=${PWD}
+WORKSPACE=${PWD}/.dpkgbuild
+DEBIANDIR=${WORKSPACE}/debian
+DEBIANBINDIR=${WORKSPACE}/DEBIAN
+mkdir --parents --verbose ${WORKSPACE} ${DEBIANBINDIR}
+make PREFIX=${WORKSPACE} INSTALLED_PREFIX=${PREFIX}
+#mkdir --parents --verbose ${DEBIANDIR}
+CONTROLFILE="${BASEDIR}/packaging/deb/likwid.deb.control"
+COMMITISH="HEAD"
+VERS=$(git describe --tags --abbrev=0 ${COMMITISH})
+VERS=${VERS#v}
+VERS=$(echo ${VERS} | sed -e s/-/_/g)
+ARCH=$(uname -m)
+ARCH=$(echo ${ARCH} | sed -e s/-/_/g)
+if [ "${ARCH}" = "x86-64" ]; then
+    ARCH=amd64
+fi
+if [ "${VERS}" = "" ]; then
+    VERS="$(VERSION).$(RELEASE).$(MINOR)"
+fi
+PREFIX="${NAME}-${VERSION}_${ARCH}"
+SIZE_BYTES=$(du -bcs --exclude=.dpkgbuild "$WORKSPACE"/ | awk '{print $1}' | head -1 | sed -e 's#^0\+##')
+SIZE="$(awk -v size="${SIZE_BYTES}" 'BEGIN {print (size/1024)+1}' | awk '{print int($0)}')"
+#sed -e s#"{VERSION}"#"$VERS"#g -e s#"{INSTALLED_SIZE}"#"$SIZE"#g -e s#"{ARCH}"#"$ARCH"#g ${CONTROLFILE} > ${DEBIANDIR}/control
+sed -e s#"{VERSION}"#"${VERS}"#g -e s#"{INSTALLED_SIZE}"#"${SIZE}"#g -e s#"{ARCH}"#"${ARCH}"#g ${CONTROLFILE} > ${DEBIANBINDIR}/control
+sudo make PREFIX=${WORKSPACE} INSTALLED_PREFIX=${PREFIX} install
+DEB_FILE="likwid_${VERS}_${ARCH}.deb"
+dpkg-deb -b ${WORKSPACE} "${DEB_FILE}"
+sudo rm -r "${WORKSPACE}"
+if [ "${GITHUB_ACTIONS}" = "true" ]; then
+     echo "::set-output name=DEB::${DEB_FILE}"
+fi
diff --git a/packaging/rpm/package.sh b/packaging/rpm/package.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -eu
+
+if [ -z ${FROM_MAKEFILE+1} ]; then
+    echo "$0 is not intended to be run manually. Please run 'make RPM' instead."
+    exit 1
+fi
+
+# pwd matters, so only call from Makefile directory
+SPECFILE="packaging/rpm/likwid.spec"
+# Setup RPM build tree
+eval $(rpm --eval "ARCH='%{_arch}' RPMDIR='%{_rpmdir}' SOURCEDIR='%{_sourcedir}' SPECDIR='%{_specdir}' SRPMDIR='%{_srcrpmdir}' BUILDDIR='%{_builddir}'")
+mkdir --parents --verbose "${RPMDIR}" "${SOURCEDIR}" "${SPECDIR}" "${SRPMDIR}" "${BUILDDIR}"
+# Create source tarball
+COMMITISH="HEAD"
+VERS=$(git describe --tags --abbrev=0 ${COMMITISH})
+VERS=${VERS#v}
+VERS=$(echo ${VERS} | sed -e s/-/_/g)
+if [ "${VERS}" = "" ]; then
+    VERS="$(VERSION).$(RELEASE).$(MINOR)"
+fi
+eval $(rpmspec --query --queryformat "NAME='%{name}' VERSION='%{version}' RELEASE='%{release}' NVR='%{NVR}' NVRA='%{NVRA}'" --define="VERS ${VERS}" "${SPECFILE}")
+PREFIX="${NAME}-${VERSION}"
+FORMAT="tar.gz"
+SRCFILE="${SOURCEDIR}/${PREFIX}.${FORMAT}"
+git archive --verbose --format "${FORMAT}" --prefix="${PREFIX}/" --output="${SRCFILE}" ${COMMITISH}
+# Build RPM and SRPM
+rpmbuild -ba --define="VERS ${VERS}" --rmsource --clean "${SPECFILE}"
+# Report RPMs and SRPMs when in GitHub Workflow
+if [[ "${GITHUB_ACTIONS}" == true ]]; then
+     RPMFILE="${RPMDIR}/${ARCH}/${NVRA}.rpm"
+     SRPMFILE="${SRPMDIR}/${NVR}.src.rpm"
+     echo "RPM: ${RPMFILE}"
+     echo "SRPM: ${SRPMFILE}"
+     echo "::set-output name=SRPM::${SRPMFILE}"
+     echo "::set-output name=RPM::${RPMFILE}"
+fi
diff --git a/src/access-daemon/Makefile b/src/access-daemon/Makefile
@@ -30,9 +30,9 @@
 include  ../../config.mk
 include  ../../make/include_$(COMPILER).mk
 
-DAEMON_TARGET = likwid-accessD
-SETFREQ_TARGET = likwid-setFreq
-APPDAEMON_TARGET = likwid-appDaemon.so
+DAEMON_TARGET = ../../likwid-accessD
+SETFREQ_TARGET = ../../likwid-setFreq
+APPDAEMON_TARGET = ../../likwid-appDaemon.so
 SYSFSDAEMON_TARGET = ../../likwid-sysD
 GOTCHA_FOLDER = ../../ext/GOTCHA
 Q         ?= @
@@ -61,13 +61,13 @@ all: $(DAEMON_TARGET) $(SETFREQ_TARGET) $(APPDAEMON_TARGET)
 endif
 
 $(DAEMON_TARGET): accessDaemon.c ../intel_perfmon_uncore_discovery.c
-	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o ../../$(DAEMON_TARGET) accessDaemon.c ../intel_perfmon_uncore_discovery.c
+	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ accessDaemon.c ../intel_perfmon_uncore_discovery.c
 
 $(SETFREQ_TARGET): setFreqDaemon.c
-	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o ../../$(SETFREQ_TARGET) setFreqDaemon.c
+	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ setFreqDaemon.c
 
 $(APPDAEMON_TARGET): $(GOTCHA_TARGET) appDaemon.c ../bstrlib.c ../bstrlib_helper.c
-	$(Q)$(CC) -pthread -shared -fvisibility=hidden -fPIC $(CPPFLAGS) -Wl,-soname,$(APPDAEMON_TARGET).$(VERSION).$(RELEASE),--no-undefined -fstack-protector -I. -I$(GOTCHA_FOLDER)/include  -L$(GOTCHA_FOLDER) appDaemon.c ../bstrlib.c ../bstrlib_helper.c -o ../../$(APPDAEMON_TARGET)  -llikwid -llikwid-gotcha -ldl
+	$(Q)$(CC) -pthread -shared -fvisibility=hidden -fPIC $(CPPFLAGS) -Wl,-soname,$(notdir $(APPDAEMON_TARGET)).$(VERSION).$(RELEASE),--no-undefined -fstack-protector -I. -I$(GOTCHA_FOLDER)/include  -L$(GOTCHA_FOLDER) appDaemon.c ../bstrlib.c ../bstrlib_helper.c -o $@  -llikwid -llikwid-gotcha -ldl
 
 $(SYSFSDAEMON_TARGET): sysfsDaemon.c
-	$(Q)$(CC) -g -fsanitize=address -fsanitize=leak -fomit-frame-pointer  $(CFLAGS) $(CPPFLAGS) -o ../../sysfsD sysfsDaemon.c
+	$(Q)$(CC) -g -fsanitize=address -fsanitize=leak -fomit-frame-pointer  $(CFLAGS) $(CPPFLAGS) -o $@ sysfsDaemon.c
diff --git a/src/pthread-overload/Makefile b/src/pthread-overload/Makefile
@@ -35,7 +35,7 @@ include  ../../make/config_defines.mk
 
 Q         ?= @
 
-TARGET   = $(PINLIB)
+TARGET   = ../../$(PINLIB)
 
 ifneq ($(COLOR),NONE)
 DEFINES += -DCOLOR=$(COLOR)
@@ -46,8 +46,8 @@ INCLUDES += -I../includes
 LIBS     += -ldl
 CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(INCLUDES)
 
-all: $(TARGET)
+all: ../../$(TARGET)
 
 $(TARGET): pthread-overload.c
-	$(Q)$(CC) -Wl,-soname,$(TARGET).$(VERSION).$(RELEASE) $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(SHARED_CFLAGS) $(SHARED_LFLAGS) -o ../../$(TARGET) pthread-overload.c $(LIBS)
+	$(Q)$(CC) -Wl,-soname,$(notdir $(TARGET)).$(VERSION).$(RELEASE),--no-undefined $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(SHARED_CFLAGS) $(SHARED_LFLAGS) -o $@ pthread-overload.c $(LIBS)