1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
|
Description: Debianize Package
make config.mk etc. able to cope with Debian build process
Author: Christoph Martin <martin@uni-mainz.de>
Last-Update: 2014-10-24
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/make/include_GCC.mk
+++ b/make/include_GCC.mk
@@ -1,5 +1,5 @@
CC = gcc
-FC = ifort
+FC = gfortran
AS = as
AR = ar
PAS = ./perl/AsmGen.pl
@@ -12,16 +12,16 @@ ANSI_CFLAGS =
#ANSI_CFLAGS += -Wextra
#ANSI_CFLAGS += -Wall
-CFLAGS = -O2 -std=c99 -Wno-format -fPIC
-FCFLAGS = -module ./ # ifort
-#FCFLAGS = -J ./ -fsyntax-only #gfortran
+CFLAGS += -O2 -std=c99 -fPIC
+#FCFLAGS = -module ./ # ifort
+FCFLAGS = $(FFLAGS) -J ./ -fsyntax-only #gfortran
PASFLAGS = x86-64
ASFLAGS =
-CPPFLAGS =
-LFLAGS = -pthread
+CPPFLAGS +=
+LFLAGS = $(DLDFLAGS) -pthread
SHARED_CFLAGS = -fPIC -fvisibility=hidden
-SHARED_LFLAGS = -shared -fvisibility=hidden
+SHARED_LFLAGS = $(DLDFLAGS) -shared -fvisibility=hidden
DEFINES = -DPAGE_ALIGNMENT=4096
DEFINES += -DLIKWID_MONITOR_LOCK
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ FILTER_DIR = $(BASE_DIR)/filters
MAKE_DIR = $(BASE_DIR)/make
EXAMPLES_DIR = $(BASE_DIR)/examples
-Q ?= @
+#Q ?= @
#DO NOT EDIT BELOW
@@ -61,7 +61,6 @@ endif
#CONFIGURE BUILD SYSTEM
BUILD_DIR = ./$(COMPILER)
-Q ?= @
GENGROUPLOCK = .gengroup
VPATH = $(SRC_DIR)
@@ -205,7 +204,7 @@ OBJ := $(filter-out $(BUILD_DIR)/likwid_
OBJ := $(filter-out $(BUILD_DIR)/devstring.o,$(OBJ))
endif
-CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(INCLUDES)
+CPPFLAGS := $(DCPPFLAGS) $(DEFINES) $(INCLUDES)
ifeq ($(BUILDDAEMON),false)
all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF) $(PINLIB) $(L_APPS) $(L_HELPER) $(FREQ_TARGET) $(BENCH_TARGET) $(APPDAEMON_TARGET)
@@ -241,7 +240,7 @@ 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
- @sed -e s#'<INSTALLED_BINPREFIX>'#$(subst /,\\/,$(INSTALLED_BINPREFIX))#g \
+ $(Q)@sed -e s#'<INSTALLED_BINPREFIX>'#$(subst /,\\/,$(INSTALLED_BINPREFIX))#g \
-e s#'<INSTALLED_LIBPREFIX>'#$(subst /,\\/,$(INSTALLED_LIBPREFIX))#g \
-e s#'<INSTALLED_PREFIX>'#$(subst /,\\/,$(INSTALLED_PREFIX))#g \
-e s#'<VERSION>'#$(VERSION).$(RELEASE).$(MINOR)#g \
@@ -257,7 +256,7 @@ $(L_APPS): $(addprefix $(SRC_DIR)/appli
$(L_HELPER):
@echo "===> ADJUSTING $@"
- @sed -e s#'<PREFIX>'#$(subst /,\\/,$(PREFIX))#g \
+ $(Q)@sed -e s#'<PREFIX>'#$(subst /,\\/,$(PREFIX))#g \
-e s#'<INSTALLED_LIBPREFIX>'#$(subst /,\\/,$(INSTALLED_LIBPREFIX))#g \
-e s#'<INSTALLED_PREFIX>'#$(subst /,\\/,$(INSTALLED_PREFIX))#g \
-e s#'<LIKWIDGROUPPATH>'#$(subst /,\\/,$(LIKWIDGROUPPATH))#g \
@@ -280,7 +279,7 @@ $(STATIC_TARGET_LIB): $(BUILD_DIR) $(PER
$(DYNAMIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB)
@echo "===> CREATE SHARED LIB $(TARGET_LIB)"
- $(Q)${CC} $(DEBUG_FLAGS) $(SHARED_LFLAGS) -Wl,-soname,$(TARGET_LIB).$(VERSION).$(RELEASE) $(SHARED_CFLAGS) -o $(DYNAMIC_TARGET_LIB) $(OBJ) $(LIBS) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB) $(RPATHS)
+ $(Q)${CC} $(DEBUG_FLAGS) $(SHARED_LFLAGS) -Wl,-soname,$(TARGET_LIB).$(VERSION).$(RELEASE) $(SHARED_CFLAGS) -o $(DYNAMIC_TARGET_LIB) $(OBJ) $(LIBS) $(RPATHS)
@ln -sf $(TARGET_LIB) $(TARGET_LIB).$(VERSION).$(RELEASE)
@sed -e s#'@PREFIX@'#$(INSTALLED_PREFIX)#g \
-e s#'@NVIDIA_INTERFACE@'#$(NVIDIA_INTERFACE)#g \
@@ -386,7 +385,7 @@ endif
.NOTPARALLEL:
-clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(TARGET_GOTCHA_LIB) $(BENCH_TARGET)
+clean: $(TARGET_GOTCHA_LIB) $(BENCH_TARGET)
@echo "===> CLEAN"
@for APP in $(L_APPS) likwid-sysfeatures; do \
rm -f $$APP; \
@@ -399,7 +398,7 @@ clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_
@rm -f $(FREQ_TARGET) $(DAEMON_TARGET) $(APPDAEMON_TARGET) $(CONTAINER_HELPER_TARGET)
@rm -f likwid-config.cmake
-distclean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(TARGET_GOTCHA_LIB) $(BENCH_TARGET)
+distclean: $(TARGET_GOTCHA_LIB) $(BENCH_TARGET)
@echo "===> DIST CLEAN"
@for APP in $(L_APPS) likwid-sysfeatures; do \
rm -f $$APP; \
@@ -558,8 +557,8 @@ install: install_daemon install_freq ins
@if [ "$(LUA_INTERNAL)" = "true" ]; then \
install -m 755 ext/lua/lua $(BINPREFIX)/$(LUA_LIB_NAME); \
fi
- @echo "===> INSTALL helper applications to $(BINPREFIX)"
- @install -m 755 perl/feedGnuplot $(BINPREFIX)
+# @echo "===> INSTALL helper applications to $(BINPREFIX)"
+# @install -m 755 perl/feedGnuplot $(BINPREFIX)
@echo "===> INSTALL lua to likwid interface to $(PREFIX)/share/lua"
@mkdir -p $(PREFIX)/share/lua
@chmod 755 $(PREFIX)/share/lua
@@ -595,11 +594,11 @@ install: install_daemon install_freq ins
@echo "===> INSTALL man pages to $(MANPREFIX)/man1"
@mkdir -p $(MANPREFIX)/man1
@chmod 755 $(MANPREFIX)/man1
- @sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" < $(DOC_DIR)/likwid-topology.1 > $(MANPREFIX)/man1/likwid-topology.1
- @sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" -e "s#<PREFIX>#$(PREFIX)#g" < $(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1
+ @sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" -e "s+<INSTALLED_PREFIX>+$(INSTALLED_PREFIX)+g" < $(DOC_DIR)/likwid-topology.1 > $(MANPREFIX)/man1/likwid-topology.1
+ @sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" -e "s#<INSTALLED_PREFIX>#$(INSTALLED_PREFIX)#g" < $(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1
@sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" < $(DOC_DIR)/likwid-powermeter.1 > $(MANPREFIX)/man1/likwid-powermeter.1
@sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" < $(DOC_DIR)/likwid-pin.1 > $(MANPREFIX)/man1/likwid-pin.1
- @sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
+# @sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
@sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" < $(DOC_DIR)/likwid-accessD.1 > $(MANPREFIX)/man1/likwid-accessD.1
@sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" < $(DOC_DIR)/likwid-genTopoCfg.1 > $(MANPREFIX)/man1/likwid-genTopoCfg.1
@sed -e "s#<VERSION>#$(VERSION)#g" -e "s#<DATE>#$(DATE)#g" -e "s#<GITCOMMIT>#$(GITCOMMIT)#g" -e "s#<MINOR>#$(MINOR)#g" < $(DOC_DIR)/likwid-memsweeper.1 > $(MANPREFIX)/man1/likwid-memsweeper.1
--- a/bench/Makefile
+++ b/bench/Makefile
@@ -44,11 +44,11 @@ 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 +=
-CFLAGS := $(filter-out -fvisibility=hidden, $(CFLAGS))
+CFLAGS := $(filter-out -fvisibility=hidden, $(CFLAGS)) -pie -fPIE
#CONFIGURE BUILD SYSTEM
BUILD_DIR = ./$(COMPILER)
-Q ?= @
+#Q ?= @
BENCH_DIR = ./x86-64
ifeq ($(COMPILER),MIC)
@@ -78,7 +78,8 @@ endif
-SHARED_TARGET_LIB := -L.. -L$(subst bench/ext,ext,$(HWLOC_LIB_DIR)) -L$(subst bench/ext,ext,$(LUA_LIB_DIR)) -llikwid -l$(HWLOC_LIB_NAME) -l$(LUA_LIB_NAME)
+#SHARED_TARGET_LIB := -L.. -L$(subst bench/ext,ext,$(HWLOC_LIB_DIR)) -L$(subst bench/ext,ext,$(LUA_LIB_DIR)) -llikwid -l$(HWLOC_LIB_NAME) -l$(LUA_LIB_NAME)
+SHARED_TARGET_LIB := -L.. -llikwid -l$(HWLOC_LIB_NAME) -l$(LUA_LIB_NAME)
STATIC_TARGET_LIB := ../liblikwid.a $(HWLOC_LIB_DIR)/lib$(HWLOC_LIB_NAME).a $(LUA_LIB_DIR)/lib$(LUA_LIB_NAME).a
TARGET_LIB = $(SHARED_TARGET_LIB)
@@ -108,7 +109,7 @@ endif
OBJ_BENCH = $(patsubst $(BENCH_DIR)/%.ptt, $(BUILD_DIR)/%.o,$(wildcard $(BENCH_DIR)/*.ptt))
BENCH = $(shell basename $(BENCH_TARGET))
-CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(INCLUDES)
+CPPFLAGS := $(DCPPFLAGS) $(DEFINES) $(INCLUDES)
all: $(BUILD_DIR) $(OBJ) $(OBJ_BENCH) $(BENCH_TARGET)
@@ -116,7 +117,7 @@ all: $(BUILD_DIR) $(OBJ) $(OBJ_BENCH) $(
$(BENCH_TARGET): $(BENCH)
$(BENCH): likwid-bench.c $(BUILD_DIR) $(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)
+ $(Q)${CC} $(DEBUG_FLAGS) $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) ${LFLAGS} likwid-bench.c $(BENCH_LIBS) $(OBJ_BENCH) $(OBJ) $(DLDFLAGS) -o $(BENCH) $(TARGET_LIB) $(LIBS) $(RPATHS)
$(BUILD_DIR):
--- a/src/access-daemon/Makefile
+++ b/src/access-daemon/Makefile
@@ -35,7 +35,7 @@ SETFREQ_TARGET = likwid-setFreq
APPDAEMON_TARGET = likwid-appDaemon.so
SYSFSDAEMON_TARGET = ../../likwid-sysD
GOTCHA_FOLDER = ../../ext/GOTCHA
-Q ?= @
+#Q ?= @
DEFINES += -D_GNU_SOURCE -DMAX_NUM_THREADS=$(MAX_NUM_THREADS) -DMAX_NUM_NODES=$(MAX_NUM_NODES) -DLIKWIDLOCK=$(LIKWIDLOCKPATH) -DLIKWIDSOCKETBASE=$(LIKWIDSOCKETBASE)
ifeq ($(DEBUG),true)
@@ -49,9 +49,9 @@ DEFINES += -DLIKWID_ROCMON
endif
INCLUDES = -I../includes
CFLAGS += -std=c99 -fPIC -pie -fPIE -fstack-protector
-ifeq ($(COMPILER),GCCX86)
-CFLAGS += -m32
-endif
+#ifeq ($(COMPILER),GCCX86)
+#CFLAGS += -m32
+#endif
CPPFLAGS := $(DEFINES) $(INCLUDES) -L../..
ifeq ($(COMPILER),GCCARMv8)
@@ -61,10 +61,10 @@ all: $(DAEMON_TARGET) $(SETFREQ_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) $(LDFLAGS) -o ../../$(DAEMON_TARGET) accessDaemon.c ../intel_perfmon_uncore_discovery.c
$(SETFREQ_TARGET): setFreqDaemon.c
- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o ../../$(SETFREQ_TARGET) setFreqDaemon.c
+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ../../$(SETFREQ_TARGET) 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
--- a/config.mk
+++ b/config.mk
@@ -9,7 +9,11 @@
# Supported: GCC, CLANG, ICC, MIC (ICC), GCCX86 (for 32bit systems)
# GCCARMv8, GCCARMv7 and GCCPOWER
# Since 5.3, there is a generic GCCARM target
+ifeq "$(DEB_BUILD_ARCH)" "i386"
+COMPILER = GCCX86#NO SPACE
+else
COMPILER = GCC#NO SPACE
+endif
# Absolute path where to install likwid. If you need just an intermediate
# install location, e.g. for packaging, use PREFIX for the intermediate
@@ -101,20 +105,20 @@ INSTALLED_CONTAINER_HELPER = $(INSTALLED
# chown installed tools to this user/group
# if you change anything here, make sure that the user/group can access
# the MSR devices and (on Intel) the PCI devices.
-INSTALL_CHOWN = -g root -o root#NO SPACE
+#INSTALL_CHOWN = -g root -o root#NO SPACE
# uncomment to optionally set external lua@5.2 or lua@5.3:
# default is use internally provide lua
-#LUA_INCLUDE_DIR = /usr/include/lua5.2#NO SPACE
+LUA_INCLUDE_DIR = /usr/include/lua5.3#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.3#NO SPACE, executable is assumed to have the same name
+LUA_BIN = /usr/bin#NO SPACE
# uncomment to optionally use system hwloc (tested with hwloc 2.x):
# default is to use internal hwloc
-#HWLOC_INCLUDE_DIR = /usr/include#NO SPACE
-#HWLOC_LIB_DIR = /usr/lib#NO SPACE
-#HWLOC_LIB_NAME = hwloc#NO SPACE, used later as -l$HWLOC_LIB_NAME
+HWLOC_INCLUDE_DIR = /usr/include#NO SPACE
+HWLOC_LIB_DIR = /usr/lib#NO SPACE
+HWLOC_LIB_NAME = hwloc#NO SPACE, used later as -l$HWLOC_LIB_NAME
# Change to true to a build shared library instead of a static one
# It is NOT recommended to switch to static libraries as some features don't
--- a/make/include_GCCX86.mk
+++ b/make/include_GCCX86.mk
@@ -1,4 +1,5 @@
CC = gcc
+FC = gfortran
AS = as
AR = ar
PAS = ./perl/AsmGen.pl
@@ -11,15 +12,15 @@ ANSI_CFLAGS = -std=c99
#ANSI_CFLAGS += -Wextra
#ANSI_CFLAGS += -Wall
-CFLAGS = -O2 -g -m32 -Wno-format -fPIC
-FCFLAGS = -J ./ -fsyntax-only
+CFLAGS += -O2 -g -fPIC
+FCFLAGS = $(FFLAGS) -J ./ -fsyntax-only
PASFLAGS = x86
-ASFLAGS = --32 -g
-CPPFLAGS =
-LFLAGS = -m32 -g -pthread
+ASFLAGS = -g
+CPPFLAGS +=
+LFLAGS = $(DLDFLAGS) -g -pthread
-SHARED_CFLAGS = -fpic -fvisibility=hidden
-SHARED_LFLAGS = -shared -fvisibility=hidden
+SHARED_CFLAGS = -fPIC -fvisibility=hidden
+SHARED_LFLAGS = $(DLDFLAGS) -shared -fvisibility=hidden
DEFINES = -D_GNU_SOURCE
DEFINES += -DPAGE_ALIGNMENT=4096
|
