Skip to content

Commit c874c02

Browse files
author
gregrodgers
committed
fixed okra makefiles to use cloc.sh and also fixed non void kernels
1 parent 0e0e1cd commit c874c02

File tree

10 files changed

+33
-148
lines changed

10 files changed

+33
-148
lines changed

‎examples/okra/BVH/BVH‎

-45.4 KB
Binary file not shown.

‎examples/okra/BVH/BVH.hsail‎

Lines changed: 0 additions & 135 deletions
This file was deleted.

‎examples/okra/BVH/Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
#ifndef HSA_RUNTIME_PATH
22
HSA_RUNTIME_PATH=/opt/hsa
33
#endif
4+
#ifndef HSA_OKRA_PATH
5+
HSA_OKRA_PATH=/opt/amd/okra
6+
#endif
47
TEST_NAME=BVH
58
CC=g++
69
LFLAGS+= -g -Wl,--unresolved-symbols=ignore-in-shared-libs
710
CFLAGS+= -std=c++11
8-
INCS += -I $(HSA_RUNTIME_PATH)/include
11+
INCS += -I $(HSA_RUNTIME_PATH)/include -I $(HSA_OKRA_PATH)/dist/include
912
CPP_FILES := $(wildcard *.cpp)
1013
OBJ_FILES := $(addprefix obj/, $(notdir $(CPP_FILES:.cpp=.o)))
1114

@@ -15,7 +18,7 @@ $(TEST_NAME): $(OBJ_FILES)
1518
$(CC) $(LFLAGS) $(OBJ_FILES) -lelf -L$(HSA_RUNTIME_PATH)/lib -lokra_x86_64 -o $(TEST_NAME)
1619

1720
$(TEST_NAME).hsail :
18-
cloc -hsail $(TEST_NAME).cl
21+
cloc.sh -hsail $(TEST_NAME).cl
1922

2023
obj/%.o: %.cpp
2124
$(CC) -c $(CFLAGS) $(INCS) -o $@ $<

‎examples/okra/CalcPI/CalcPI.cl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
kernel calcPI(global float *x, global float *y, global int *out) {
1+
__kernel void calcPI(global float *x, global float *y, global int *out) {
22
int i = get_global_id(0);
33

44
float c = x[i]*x[i] + y[i]*y[i];
55
out[i] = 0;
66
if (c <= 1) out[i] = 1;
77
}
8-

‎examples/okra/CalcPI/Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#ifndef HSA_RUNTIME_PATH
22
HSA_RUNTIME_PATH=/opt/hsa
33
#endif
4+
#ifndef HSA_OKRA_PATH
5+
HSA_OKRA_PATH=/opt/amd/okra
6+
#endif
47
CC=g++
58
TEST_NAME=CalcPI
69
LFLAGS= -g -Wl,--unresolved-symbols=ignore-in-shared-libs
7-
INCS += -I $(HSA_RUNTIME_PATH)/include
10+
INCS += -I $(HSA_RUNTIME_PATH)/include -I $(HSA_OKRA_PATH)/dist/include
811
CPP_FILES := $(wildcard *.cpp)
912
OBJ_FILES := $(addprefix obj/, $(notdir $(CPP_FILES:.cpp=.o)))
1013

@@ -14,7 +17,7 @@ $(TEST_NAME): $(OBJ_FILES)
1417
$(CC) $(LFLAGS) $(OBJ_FILES) -lelf -L$(HSA_RUNTIME_PATH)/lib -lokra_x86_64 -o $(TEST_NAME)
1518

1619
$(TEST_NAME).hsail :
17-
cloc -hsail $(TEST_NAME).cl
20+
cloc.sh -hsail $(TEST_NAME).cl
1821

1922
obj/%.o: %.cpp
2023
$(CC) -c $(CFLAGS) $(INCS) -o $@ $<

‎examples/okra/MatMul/Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
#ifndef HSA_RUNTIME_PATH
22
HSA_RUNTIME_PATH=/opt/hsa
33
#endif
4+
#ifndef HSA_OKRA_PATH
5+
HSA_OKRA_PATH=/opt/amd/okra
6+
#endif
47
TEST_NAME=MatMul
58
LFLAGS= -g -Wl,--unresolved-symbols=ignore-in-shared-libs
6-
INCS += -I $(HSA_RUNTIME_PATH)/include
9+
INCS += -I $(HSA_RUNTIME_PATH)/include -I $(HSA_OKRA_PATH)/dist/include
710
CPP_FILES := $(wildcard *.cpp)
811
OBJ_FILES := $(addprefix obj/, $(notdir $(CPP_FILES:.cpp=.o)))
912

@@ -13,7 +16,7 @@ $(TEST_NAME): $(OBJ_FILES)
1316
$(CXX) $(LFLAGS) $(OBJ_FILES) -lelf -L$(HSA_RUNTIME_PATH)/lib -lokra_x86_64 -o $(TEST_NAME)
1417

1518
$(TEST_NAME).hsail :
16-
cloc -hsail $(TEST_NAME).cl
19+
cloc.sh -hsail $(TEST_NAME).cl
1720

1821
obj/%.o: %.cpp
1922
$(CC) -c $(CFLAGS) $(INCS) -o $@ $<

‎examples/okra/MatMul/MatMul.cl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kernel int matmul(global int *A, global int *B, global int *C, global int *N1, global int *P1) {
1+
kernel void matmul(global int *A, global int *B, global int *C, global int *N1, global int *P1) {
22
int i = get_global_id(0);
33
int j = get_global_id(1);
44
int k;

‎examples/okra/README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
```
2+
#For building OKRA examples
3+
export OKRA_DISABLE_FIX_HSAIL=1
4+
make all CFLAGS=-DDUMMY_ARGS=1
5+
make test
6+
```

‎examples/okra/SVMAtomicsBinaryTreeInsert/Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
#ifndef HSA_RUNTIME_PATH
22
HSA_RUNTIME_PATH=/opt/hsa
33
#endif
4+
#ifndef HSA_OKRA_PATH
5+
HSA_OKRA_PATH=/opt/amd/okra
6+
#endif
47
TEST_NAME=SVMAtomicsBinaryTreeInsert
58
LFLAGS= -g -Wl,--unresolved-symbols=ignore-in-shared-libs
6-
INCS += -I $(HSA_RUNTIME_PATH)/include
9+
INCS += -I $(HSA_RUNTIME_PATH)/include -I $(HSA_OKRA_PATH)/dist/include
710
CFLAGS += -std=c++11
811
CPP_FILES := $(wildcard *.cpp)
912
OBJ_FILES := $(addprefix obj/, $(notdir $(CPP_FILES:.cpp=.o)))
@@ -14,7 +17,7 @@ $(TEST_NAME): $(OBJ_FILES)
1417
$(CXX) $(LFLAGS) $(OBJ_FILES) -lelf -L$(HSA_RUNTIME_PATH)/lib -lokra_x86_64 -o $(TEST_NAME)
1518

1619
$(TEST_NAME).hsail :
17-
cloc -hsail $(TEST_NAME).cl
20+
cloc.sh -hsail $(TEST_NAME).cl
1821

1922
obj/%.o: %.cpp
2023
$(CC) -c $(CFLAGS) $(INCS) -o $@ $<

‎examples/okra/SVMBinaryTreeSearch/Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
#ifndef HSA_RUNTIME_PATH
22
HSA_RUNTIME_PATH=/opt/hsa
33
#endif
4+
#ifndef HSA_OKRA_PATH
5+
HSA_OKRA_PATH=/opt/amd/okra
6+
#endif
47
TEST_NAME=SVMBinaryTreeSearch
58
LFLAGS= -g -Wl,--unresolved-symbols=ignore-in-shared-libs
6-
INCS += -I $(HSA_RUNTIME_PATH)/include
9+
INCS += -I $(HSA_RUNTIME_PATH)/include -I $(HSA_OKRA_PATH)/dist/include
710
CPP_FILES := $(wildcard *.cpp)
811
OBJ_FILES := $(addprefix obj/, $(notdir $(CPP_FILES:.cpp=.o)))
912

@@ -13,7 +16,7 @@ $(TEST_NAME): $(OBJ_FILES)
1316
$(CXX) $(LFLAGS) $(OBJ_FILES) -lelf -L$(HSA_RUNTIME_PATH)/lib -lokra_x86_64 -o $(TEST_NAME)
1417

1518
$(TEST_NAME).hsail :
16-
cloc -hsail $(TEST_NAME).cl
19+
cloc.sh -hsail $(TEST_NAME).cl
1720

1821
obj/%.o: %.cpp
1922
$(CXX) -c $(CFLAGS) $(INCS) -o $@ $<

0 commit comments

Comments
 (0)