[Likwid-commit] [likwid] 03/06: update patches
Christoph Martin
chrism at debian.org
Wed Jan 11 15:24:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
chrism pushed a commit to branch master
in repository likwid.
commit 5d0a7d9982f7daeffacc6cba64c5256c8025d297
Author: Christoph Martin <martin at uni-mainz.de>
Date: Wed Jan 11 11:43:50 2017 +0100
update patches
---
debian/changelog | 7 ++
debian/patches/02-man-pages-fix.patch | 14 ++--
debian/patches/10-debianize.patch | 108 +++++++++---------------------
debian/patches/15-32bit-regtypemask.patch | 21 +++---
4 files changed, 57 insertions(+), 93 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2038b83..afbc860 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+likwid (4.2.0-1) unstable; urgency=medium
+
+ [ Christoph Martin ]
+ * Imported Upstream version 4.2.0
+
+ -- Christoph Martin <martin at uni-mainz.de> Wed, 11 Jan 2017 11:42:09 +0100
+
likwid (4.1.2+dfsg1-4) unstable; urgency=medium
[ Thomas.Roehl ]
diff --git a/debian/patches/02-man-pages-fix.patch b/debian/patches/02-man-pages-fix.patch
index 3f26670..6b0db33 100644
--- a/debian/patches/02-man-pages-fix.patch
+++ b/debian/patches/02-man-pages-fix.patch
@@ -22,7 +22,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
.B http://code.google.com/p/likwid/wiki/LikwidBench
--- a/doc/likwid-perfctr.1
+++ b/doc/likwid-perfctr.1
-@@ -33,8 +33,8 @@ or
+@@ -34,8 +34,8 @@ or
is a lightweight command line application to configure and read out hardware performance monitoring data
on supported x86 processors. It can measure either as wrapper without changing the measured application
or with marker API functions inside the code, which will turn on and off the counters. There are preconfigured
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
.SH OPTIONS
.TP
-@@ -45,7 +45,7 @@ prints version information to standard o
+@@ -46,7 +46,7 @@ prints version information to standard o
prints a help message to standard output, then exits.
.TP
.B \-\^H
@@ -42,7 +42,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
.TP
.B \-\^V <level>, \-\-\^verbose <level>
verbose output during execution for debugging. 0 for only errors, 1 for informational output, 2 for detailed output and 3 for developer output
-@@ -60,9 +60,9 @@ print available performance groups for c
+@@ -61,9 +61,9 @@ print available performance groups for c
print available counters and performance events of current processor.
.TP
.B \-\^o, \-\-\^output <filename>
@@ -54,7 +54,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
the filename. For txt the output is printed as is to the file. Other suffixes trigger a filter on the output.
Available filters are csv (comma separated values) and xml at the moment.
.TP
-@@ -84,7 +84,7 @@ items, separated by comma, and ranges. F
+@@ -85,7 +85,7 @@ items, separated by comma, and ranges. F
also pin the threads to the cores. Also logical numberings can be used.
.TP
.B \-\^g, \-\-\^group <performance group> or <performance event set string>
@@ -63,7 +63,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
Also a custom event set can be specified by a comma separated list of events. Each event has the format
eventId:register with the the register being one of a architecture supported performance counter registers.
.TP
-@@ -154,7 +154,7 @@ Using the marker API to measure only par
+@@ -158,7 +158,7 @@ Using the marker API to measure only par
.B likwid-perfctr -m -C 0-4 -g INSTRUCTIONS_RETIRED_SSE:PMC0,CPU_CLOCKS_UNHALTED:PMC3 ./cacheBench
.PP
You have to link you code against liblikwid.so and use the marker API calls.
@@ -147,7 +147,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
.B \-\^h,\-\-\^help
--- a/doc/likwid-setFreq.1
+++ b/doc/likwid-setFreq.1
-@@ -15,7 +15,8 @@ is a command line application that media
+@@ -27,7 +27,8 @@ is a command line application that media
.B likwid-setFrequencies(1)
because setting a CPU core's frequency and/or governor requires root privileges. This executable must be suid-root.
.B likwid-setFreq
@@ -159,7 +159,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
.SH AUTHOR
--- a/doc/likwid-setFrequencies.1
+++ b/doc/likwid-setFrequencies.1
-@@ -22,7 +22,7 @@ works only with the kernel module
+@@ -26,7 +26,7 @@ works only with the kernel module
.B acpi-cpufreq.
The recent
.B intel_pstate
diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index eb4119c..09cf9d5 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -38,14 +38,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
DEFINES += -DLIKWID_MONITOR_LOCK
--- a/Makefile
+++ b/Makefile
-@@ -46,12 +46,12 @@ include $(MAKE_DIR)/include_$(COMPILER).
- include $(MAKE_DIR)/config_checks.mk
- include $(MAKE_DIR)/config_defines.mk
-
--INCLUDES += -I./src/includes -I$(LUA_FOLDER)/includes -I$(HWLOC_FOLDER)/include -I$(BUILD_DIR)
--LIBS += -ldl
-+INCLUDES += -I./src/includes -I/usr/include/lua5.2 -I$(HWLOC_FOLDER)/include -I$(BUILD_DIR)
-+LIBS += -ldl -llua5.2
+@@ -55,7 +55,7 @@ endif
#CONFIGURE BUILD SYSTEM
BUILD_DIR = ./$(COMPILER)
@@ -54,7 +47,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
GENGROUPLOCK = .gengroup
VPATH = $(SRC_DIR)
-@@ -87,7 +87,7 @@ ifeq ($(BUILDFREQ),true)
+@@ -92,7 +92,7 @@ ifeq ($(BUILDFREQ),true)
L_APPS += likwid-setFrequencies
endif
@@ -63,7 +56,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF) $(PINLIB) $(L_APPS) $(L_HELPER) $(DAEMON_TARGET) $(FREQ_TARGET) $(BENCH_TARGET)
-@@ -108,7 +108,8 @@ docs:
+@@ -113,7 +113,8 @@ docs:
$(L_APPS): $(addprefix $(SRC_DIR)/applications/,$(addsuffix .lua,$(L_APPS)))
@echo "===> ADJUSTING $@"
@if [ "$(ACCESSMODE)" = "direct" ]; then sed -i -e s/"access_mode = 1"/"access_mode = 0"/g $(SRC_DIR)/applications/$@.lua;fi
@@ -73,7 +66,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-e s/'<INSTALLED_PREFIX>'/$(subst /,\\/,$(INSTALLED_PREFIX))/g \
-e s/'<VERSION>'/$(VERSION).$(RELEASE)/g \
-e s/'<DATE>'/$(DATE)/g \
-@@ -117,7 +118,7 @@ $(L_APPS): $(addprefix $(SRC_DIR)/appli
+@@ -125,7 +126,7 @@ $(L_APPS): $(addprefix $(SRC_DIR)/appli
$(L_HELPER):
@echo "===> ADJUSTING $@"
@@ -82,7 +75,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-e s/'<INSTALLED_LIBPREFIX>'/$(subst /,\\/,$(INSTALLED_LIBPREFIX))/g \
-e s/'<INSTALLED_PREFIX>'/$(subst /,\\/,$(INSTALLED_PREFIX))/g \
-e s/'<LIKWIDGROUPPATH>'/$(subst /,\\/,$(LIKWIDGROUPPATH))/g \
-@@ -126,29 +127,29 @@ $(L_HELPER):
+@@ -134,13 +135,13 @@ $(L_HELPER):
-e s/'<RELEASE>'/$(RELEASE)/g \
$(SRC_DIR)/applications/$@ > $@
@@ -91,7 +84,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@echo "===> CREATE STATIC LIB $(TARGET_LIB)"
$(Q)${AR} -crus $(STATIC_TARGET_LIB) $(OBJ) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB)
-
-$(DYNAMIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB)
+$(DYNAMIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB)
@echo "===> CREATE SHARED LIB $(TARGET_LIB)"
@@ -100,34 +92,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
$(DAEMON_TARGET): $(SRC_DIR)/access-daemon/accessDaemon.c
@echo "===> BUILD access daemon likwid-accessD"
-- $(Q)$(MAKE) -s -C $(SRC_DIR)/access-daemon likwid-accessD
-+ $(Q)$(MAKE) -C $(SRC_DIR)/access-daemon likwid-accessD
-
- $(FREQ_TARGET): $(SRC_DIR)/access-daemon/setFreq.c
- @echo "===> BUILD frequency daemon likwid-setFreq"
-- $(Q)$(MAKE) -s -C $(SRC_DIR)/access-daemon likwid-setFreq
-+ $(Q)$(MAKE) -C $(SRC_DIR)/access-daemon likwid-setFreq
-
- $(BUILD_DIR):
- @mkdir $(BUILD_DIR)
-
- $(PINLIB):
- @echo "===> CREATE LIB $(PINLIB)"
-- $(Q)$(MAKE) -s -C src/pthread-overload/ $(PINLIB)
-+ $(Q)$(MAKE) -C src/pthread-overload/ $(PINLIB)
+@@ -215,7 +216,7 @@ endif
- $(GENGROUPLOCK): $(foreach directory,$(shell ls $(GROUP_DIR)), $(wildcard $(GROUP_DIR)/$(directory)/*.txt))
- @echo "===> GENERATE GROUP HEADERS"
-@@ -207,7 +208,7 @@ endif
.NOTPARALLEL:
-
-clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
+clean: $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
@echo "===> CLEAN"
@for APP in $(L_APPS); do \
rm -f $$APP; \
-@@ -219,7 +220,7 @@ clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_
+@@ -227,7 +228,7 @@ clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_
@rm -f $(FORTRAN_IF_NAME)
@rm -f $(FREQ_TARGET) $(DAEMON_TARGET)
@@ -136,31 +110,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@echo "===> DIST CLEAN"
@for APP in $(L_APPS); do \
rm -f $$APP; \
-@@ -319,7 +320,7 @@ install: install_daemon install_freq
- @for APP in $(C_APPS); do \
- install -m 755 $$APP $(BINPREFIX); \
- done
-- @install -m 755 ext/lua/lua $(BINPREFIX)/likwid-lua
-+# @install -m 755 ext/lua/lua $(BINPREFIX)/likwid-lua
- @echo "===> INSTALL helper applications to $(BINPREFIX)"
- @install -m 755 perl/feedGnuplot $(BINPREFIX)
- @echo "===> INSTALL lua to likwid interface to $(PREFIX)/share/lua"
-@@ -332,20 +333,20 @@ install: install_daemon install_freq
- @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)
-- @install -m 755 $(TARGET_LUA_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE)
-+# @install -m 755 $(TARGET_LUA_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_LUA_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)
- @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)
-- @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)
-+# @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)
+@@ -358,8 +359,8 @@ install: install_daemon install_freq
@echo "===> INSTALL man pages to $(MANPREFIX)/man1"
@mkdir -p $(MANPREFIX)/man1
@chmod 775 $(MANPREFIX)/man1
@@ -171,7 +121,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-powermeter.1 > $(MANPREFIX)/man1/likwid-powermeter.1
@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-pin.1 > $(MANPREFIX)/man1/likwid-pin.1
@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
-@@ -387,7 +388,7 @@ install: install_daemon install_freq
+@@ -401,7 +402,7 @@ install: install_daemon install_freq
@chmod 775 $(PREFIX)/share/likwid/examples
@install -m 644 examples/* $(PREFIX)/share/likwid/examples
@echo "===> INSTALL default likwid-agent.conf to $(PREFIX)/share/likwid/mongroups"
@@ -180,14 +130,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@chmod 644 $(PREFIX)/share/likwid/mongroups/likwid-agent.conf
@echo "===> INSTALL filters to $(abspath $(PREFIX)/share/likwid/filter)"
@mkdir -p $(abspath $(PREFIX)/share/likwid/filter)
-@@ -586,4 +587,3 @@ help:
- @echo "The common configuration is INSTALLED_PREFIX = PREFIX, so changing PREFIX is enough."
- @echo "If PREFIX and INSTALLED_PREFIX differ, you have to move anything after 'make install' to"
- @echo "the INSTALLED_PREFIX. You can also use 'make move' which does the job for you."
--
--- a/bench/Makefile
+++ b/bench/Makefile
-@@ -46,7 +46,7 @@ include $(MAKE_DIR)/config_defines.mk
+@@ -44,7 +44,7 @@ include $(MAKE_DIR)/config_defines.mk
#INCLUDES += -I./includes -I../src/includes -I../ext/hwloc/include -I../$(COMPILER) -I$(BUILD_DIR)
INCLUDES += -I./includes -I$(BUILD_DIR) -I../src/includes
LIBS +=
@@ -196,16 +141,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#CONFIGURE BUILD SYSTEM
BUILD_DIR = ./$(COMPILER)
-@@ -62,7 +62,7 @@ BENCH_DIR = ./x86-64
+@@ -60,7 +60,7 @@ BENCH_DIR = ./x86-64
endif
endif
--SHARED_TARGET_LIB := -L.. -L../ext/hwloc/ -L../ext/lua -llikwid -llikwid-hwloc -llikwid-lua
-+SHARED_TARGET_LIB := -L.. -L../ext/hwloc/ -llikwid -llikwid-hwloc -llua5.2
- STATIC_TARGET_LIB := ../liblikwid.a ../ext/hwloc/liblikwid-hwloc.a ../ext/lua/liblikwid-lua.a
+-SHARED_TARGET_LIB := -L.. -L../ext/hwloc/ -L$(LUA_LIB_DIR) -llikwid -llikwid-hwloc -l$(LUA_LIB_NAME)
++SHARED_TARGET_LIB := -L.. -L../ext/hwloc/ -llikwid -llikwid-hwloc -l$(LUA_LIB_NAME)
+ STATIC_TARGET_LIB := ../liblikwid.a ../ext/hwloc/liblikwid-hwloc.a $(LUA_LIB_DIR)/lib$(LUA_LIB_NAME).a
TARGET_LIB = $(SHARED_TARGET_LIB)
-@@ -88,7 +88,7 @@ endif
+@@ -85,7 +85,7 @@ endif
OBJ_BENCH = $(patsubst $(BENCH_DIR)/%.ptt, $(BUILD_DIR)/%.o,$(wildcard $(BENCH_DIR)/*.ptt))
BENCH = $(shell basename $(BENCH_TARGET))
@@ -214,7 +159,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
all: $(BUILD_DIR) $(OBJ) $(OBJ_BENCH) $(BENCH_TARGET)
-@@ -96,7 +96,7 @@ all: $(BUILD_DIR) $(OBJ) $(OBJ_BENCH) $(
+@@ -93,7 +93,7 @@ all: $(BUILD_DIR) $(OBJ) $(OBJ_BENCH) $(
$(BENCH_TARGET): $(BENCH)
$(BENCH): likwid-bench.c $(BUILD_DIR) $(OBJ) $(OBJ_BENCH)
@echo "===> LINKING $(BENCH)"
@@ -232,9 +177,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Q ?= @
+#Q ?= @
- DEFINES += -D_GNU_SOURCE -DMAX_NUM_THREADS=$(MAX_NUM_THREADS) -DMAX_NUM_NODES=$(MAX_NUM_NODES)
+ DEFINES += -D_GNU_SOURCE -DMAX_NUM_THREADS=$(MAX_NUM_THREADS) -DMAX_NUM_NODES=$(MAX_NUM_NODES) -DLIKWIDLOCK=$(LIKWIDLOCKPATH) -DLIKWIDSOCKETBASE=$(LIKWIDSOCKETBASE)
INCLUDES = -I../includes
-@@ -39,14 +39,14 @@ CFLAGS += -std=c99 -fPIC -pie -fPIE -
+@@ -39,13 +39,13 @@ CFLAGS += -std=c99 -fPIC -pie -fPIE -
ifeq ($(COMPILER),GCCX86)
CFLAGS += -m32
endif
@@ -251,10 +196,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o ../../$(SETFREQ_TARGET) setFreq.c
+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ../../$(SETFREQ_TARGET) setFreq.c
-
--- a/ext/hwloc/Makefile
+++ b/ext/hwloc/Makefile
-@@ -49,7 +49,7 @@ $(STATIC_LIBHWLOC): $(OBJ)
+@@ -45,7 +45,7 @@ $(STATIC_LIBHWLOC): $(OBJ)
$(Q)${AR} -cq $(LIBHWLOC) $(OBJ)
$(SHARED_LIBHWLOC): $(OBJ)
@@ -288,6 +232,20 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Define the color of the likwid-pin output
# Can be NONE, BLACK, RED, GREEN, YELLOW, BLUE,
+@@ -13,10 +17,10 @@ PREFIX = /usr/local#NO SPACE
+
+ # uncomment to optionally set external lua at 5.3:
+ # default is use internally provide lua
+-#LUA_INCLUDE_DIR = /usr/include/lua5.2#NO SPACE
++LUA_INCLUDE_DIR = /usr/include/lua5.2#NO SPACE
+ #LUA_LIB_DIR = /usr/lib/x86_64-linux-gnu#NO SPACE
+-#LUA_LIB_NAME = lua5.2#NO SPACE, executable is assumed to have the same name
+-#LUA_BIN = /usr/bin#NO SPACE
++LUA_LIB_NAME = lua5.2#NO SPACE, executable is assumed to have the same name
++LUA_BIN = /usr/bin#NO SPACE
+
+ #################################################################
+ # Common users do not need to change values below this comment! #
--- a/make/include_GCCX86.mk
+++ b/make/include_GCCX86.mk
@@ -1,4 +1,5 @@
diff --git a/debian/patches/15-32bit-regtypemask.patch b/debian/patches/15-32bit-regtypemask.patch
index 1223df0..ec6f7b2 100644
--- a/debian/patches/15-32bit-regtypemask.patch
+++ b/debian/patches/15-32bit-regtypemask.patch
@@ -3,15 +3,14 @@ Author: Thomas Roehl <thomas.roehl at fau.de>
Last-Update: 2016-11-21
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff -Nur likwid-4.1.2.orig/src/includes/registers_types.h likwid-4.1.2/src/includes/registers_types.h
---- likwid-4.1.2.orig/src/includes/registers_types.h 2016-08-08 13:54:06.000000000 +0200
-+++ likwid-4.1.2/src/includes/registers_types.h 2016-11-21 11:30:52.766849000 +0100
-@@ -184,7 +184,7 @@
- #ifdef __x86_64
- #define REG_TYPE_MASK(type) (type < NUM_UNITS ? (((__uint128_t)1ULL)<<type) : (((__uint128_t)0ULL)<<64|0ULL))
- #else
--#define REG_TYPE_MASK(type) (type < NUM_UNITS ? (1ULL<<type) : (0x0ULL)
-+#define REG_TYPE_MASK(type) (type < NUM_UNITS ? (1ULL<<type) : (0x0ULL))
- #endif
+--- a/src/includes/registers_types.h
++++ b/src/includes/registers_types.h
+@@ -253,7 +253,7 @@ static char* RegisterTypeNames[MAX_UNITS
+ [NOTYPE] = "No Type, used for skipping unavailable counters"
+ };
- typedef struct {
+-#define REG_TYPE_MASK(type) (type < NUM_UNITS ? ((1ULL)<<(type)) : 0x0ULL)
++#define REG_TYPE_MASK(type) (type < NUM_UNITS ? ((1ULL)<<(type)) : 0x0ULL))
+
+ #define TESTTYPE(eventset, type) \
+ (((type) >= 0 && (type) <= 63 ? eventset->regTypeMask1 & (1ULL<<(type)) : \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/likwid/likwid.git
More information about the Likwid-commit
mailing list