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
|
Author: Andreas Beckmann <anbe@debian.org>
Description: misc hipcc fixes
--- a/src/components/rocm_smi/tests/Makefile
+++ b/src/components/rocm_smi/tests/Makefile
@@ -14,6 +14,7 @@ INCLUDE += -I$(PAPI_ROCM_ROOT)/include/h
INCLUDE += -I$(PAPI_ROCM_ROOT)/include/rocprofiler
INCLUDE += -I$(PAPI_ROCM_ROOT)/include/rocblas
LDFLAGS = -ldl -g -pthread
+HIPCFLAGS = $(filter-out -fcf-protection,$(CFLAGS))
%.o:%.c
@echo "INCLUDE=" $(INCLUDE)
@@ -24,8 +25,10 @@ LDFLAGS = -ldl -g -pthread
@echo "CFLAGS=" $(CFLAGS)
g++ $(CFLAGS) $(OPTFLAGS) $(INCLUDE) -c -o $@ $<
+ifneq (,$(wildcard $(HIPCC)))
TESTS = rocm_command_line rocm_smi_all power_monitor_rocm rocm_smi_writeTests
TESTS_LONG = rocmsmi_example
+endif
rocm_smi_tests: $(TESTS)
rocm_smi_tests_long: $(TESTS_LONG)
@@ -34,34 +37,34 @@ rocm_smi_tests_long: $(TESTS_LONG)
# have trouble managing libraries if we try to do both in a single step.
rocm_command_line.o: rocm_command_line.cpp $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -c $< -o $@
rocm_command_line: rocm_command_line.o $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS)
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS)
rocm_smi_all.o: rocm_smi_all.cpp $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -c $< -o $@
rocm_smi_all: rocm_smi_all.o $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS)
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS)
power_monitor_rocm.o: power_monitor_rocm.cpp $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -c $< -o $@
power_monitor_rocm: power_monitor_rocm.o $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS)
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS)
rocmsmi_example.o: rocmsmi_example.cpp $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -c $< -o $@
rocmsmi_example: rocmsmi_example.o $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS) -L$(PAPI_ROCM_ROOT)/lib/rocblas -lrocblas
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS) -L$(PAPI_ROCM_ROOT)/lib/rocblas -lrocblas
rocm_smi_writeTests.o: rocm_smi_writeTests.cpp $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -c $< -o $@
rocm_smi_writeTests: rocm_smi_writeTests.o $(UTILOBJS) $(PAPILIB)
- $(HIPCC) $(CFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS)
+ $(HIPCC) $(HIPCFLAGS) $(INCLUDE) -o $@ $< $(UTILOBJS) $(PAPILIB) $(LDFLAGS)
clean:
rm -f $(TESTS) $(TESTS_LONG) *.o
@@ -72,5 +75,5 @@ checkpath:
echo HIPCC = $(HIPCC)
echo INCLUDE = $(INCLUDE)
echo LDFLAGS = $(LDFLAGS)
- echo CFLAGS = $(CFLAGS)
+ echo HIPCFLAGS = $(HIPCFLAGS)
|
