Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Add likwid 5.2.1 #4913

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions L/likwid/build_tarballs.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Note that this script can accept some limited command-line arguments, run
# `julia build_tarballs.jl --help` to see a usage message.
using BinaryBuilder, Pkg

name = "likwid"
version = v"5.2.1"

# Collection of sources required to complete build
sources = [
ArchiveSource("https://github.com/RRZE-HPC/likwid/archive/refs/tags/v$(version).tar.gz", "1b8e668da117f24302a344596336eca2c69d2bc2f49fa228ca41ea0688f6cbc2"),
DirectorySource("./bundled")
]

# Bash recipe for building across all platforms
script = raw"""
cd $WORKSPACE/srcdir
for f in ${WORKSPACE}/srcdir/patches/*.patch; do
atomic_patch -p1 ${f}
done
cd likwid-5.2.1/
carstenbauer marked this conversation as resolved.
Show resolved Hide resolved
make PREFIX=${prefix} HWLOC_INCLUDE_DIR=${includedir} HWLOC_LIB_DIR=${libdir} HWLOC_LIB_NAME=hwloc LUA_INCLUDE_DIR=${includedir} LUA_LIB_DIR=${libdir} LUA_LIB_NAME=lua LUA_BIN=${bindir}
make install PREFIX=${prefix} HWLOC_INCLUDE_DIR=${includedir} HWLOC_LIB_DIR=${libdir} HWLOC_LIB_NAME=hwloc LUA_INCLUDE_DIR=${includedir} LUA_LIB_DIR=${libdir} LUA_LIB_NAME=lua LUA_BIN=${bindir}
exit
carstenbauer marked this conversation as resolved.
Show resolved Hide resolved
"""

# These are the platforms we will build for by default, unless further
# platforms are passed in on the command line
platforms = [
Platform("x86_64", "linux"; libc = "glibc")
]


# The products that we will ensure are always built
products = [
LibraryProduct("liblikwidpin", :liblikwidpin),
LibraryProduct("liblikwid", :liblikwid),
ExecutableProduct("likwid-bench", :likwid_bench)
]

# Dependencies that must be installed before this package can be built
dependencies = [
Dependency(PackageSpec(name="Hwloc_jll", uuid="e33a78d0-f292-5ffc-b300-72abe9b543c8"))
Dependency(PackageSpec(name="Lua_jll", uuid="a4086b1d-a96a-5d6b-8e4f-2030e6f25ba6"))
]

# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
diff --git before/likwid-5.2.1/Makefile after/likwid-5.2.1/Makefile
index a196775..8077581 100644
--- before/likwid-5.2.1/Makefile
+++ after/likwid-5.2.1/Makefile
@@ -484,7 +484,9 @@ install: install_daemon install_freq install_appdaemon
@chmod 755 $(LIBPREFIX)
@install -m 755 $(TARGET_LIB) $(LIBPREFIX)/$(TARGET_LIB).$(VERSION).$(RELEASE)
@install -m 755 liblikwidpin.so $(LIBPREFIX)/liblikwidpin.so.$(VERSION).$(RELEASE)
- @install -m 755 $(TARGET_HWLOC_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE)
+ @if [ "$(USE_INTERNAL_HWLOC)" = "true" ]; then \
+ install -m 755 $(TARGET_HWLOC_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE); \
+ fi
@if [ "$(LUA_INTERNAL)" = "true" ]; then \
install -m 755 $(TARGET_LUA_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE); \
fi
@@ -492,8 +494,10 @@ install: install_daemon install_freq install_appdaemon
@cd $(LIBPREFIX) && ln -fs $(TARGET_LIB).$(VERSION).$(RELEASE) $(TARGET_LIB).$(VERSION)
@cd $(LIBPREFIX) && ln -fs $(PINLIB).$(VERSION).$(RELEASE) $(PINLIB)
@cd $(LIBPREFIX) && ln -fs $(PINLIB).$(VERSION).$(RELEASE) $(PINLIB).$(VERSION)
- @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_HWLOC_LIB))
- @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION)
+ @if [ "$(USE_INTERNAL_HWLOC)" = "true" ]; then \
+ cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_HWLOC_LIB)); \
+ cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION); \
+ fi
@if [ "$(LUA_INTERNAL)" = "true" ]; then \
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); \
diff --git before/likwid-5.2.1/config.mk after/likwid-5.2.1/config.mk
index aa623fd..2b4e984 100644
--- before/likwid-5.2.1/config.mk
+++ after/likwid-5.2.1/config.mk
@@ -16,7 +16,7 @@ PREFIX ?= /usr/local#NO SPACE
# Set the default mode for MSR access.
# This can usually be overriden on the commandline.
# Valid values are: direct, accessdaemon and perf_event
-ACCESSMODE = accessdaemon#NO SPACE
+ACCESSMODE = perf_event#NO SPACE

# Build Fortran90 module interface for Marker API. Adopt Fortran compiler
# in ./make/include_<COMPILER>.mk if necessary. Default: ifort (even for
@@ -67,7 +67,7 @@ INSTALLED_ACCESSDAEMON = $(INSTALLED_PREFIX)/sbin/likwid-accessD#NO SPACE

# Build the setFrequencies daemon to allow users setting the CPU and Uncore
# frequency
-BUILDFREQ = true#NO SPACE
+BUILDFREQ = false#NO SPACE
# Paths for frequencie deaemon after installation
FREQDAEMON = $(PREFIX)/sbin/likwid-setFreq#NO SPACE
INSTALLED_FREQDAEMON = $(INSTALLED_PREFIX)/sbin/likwid-setFreq#NO SPACE
diff --git before/likwid-5.2.1/make/include_GCC.mk after/likwid-5.2.1/make/include_GCC.mk
index 72850a1..7bf80a1 100644
--- before/likwid-5.2.1/make/include_GCC.mk
+++ after/likwid-5.2.1/make/include_GCC.mk
@@ -26,6 +26,7 @@ SHARED_LFLAGS = -shared -fvisibility=hidden
DEFINES = -DPAGE_ALIGNMENT=4096
DEFINES += -DLIKWID_MONITOR_LOCK
DEFINES += -DDEBUGLEV=0
+DEFINES += -DHAS_SCHEDAFFINITY

INCLUDES =
LIBS = -lm -lrt