Merge branch 'master' of github.com:ivanradanov/rodinia

ivanradanov · Mar 27, 2022 · 37379d0 · 37379d0
2 parents 6ef67b1 + 9e3ac5c
commit 37379d0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/common/beast.openmp.host.make.config b/common/beast.openmp.host.make.config
@@ -0,0 +1,12 @@
+
+CC = ~/git/Polygeist/mlir-build/bin/clang
+CXX := ~/git/Polygeist/mlir-build/bin/clang++
+SYSTEM_LINKER = $(CXX)
+
+COMPILER_NAME=openmp.gcc
+
+CC_FLAGS = -O2 -I/home/wmoses/git/Polygeist/mlir-build/projects/openmp/runtime/src/
+CXX_FLAGS := $(CC_FLAGS)
+LINKER_FLAGS = -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp 
+SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS)
+
diff --git a/common/beast.polygeist.host.make.config b/common/beast.polygeist.host.make.config
@@ -1,4 +1,4 @@
-CC = ~/git/Polygeist/build/bin/mlir-clang --raise-scf-to-affine --scal-rep=0
+CC = ~/git/Polygeist/build/bin/mlir-clang --raise-scf-to-affine --scal-rep=0 # --memref-abi=0 -struct-abi=0
 CXX = $(CC)
 NVCC = $(CC)
 LINKER = $(CC)
@@ -8,7 +8,7 @@ SYSTEM_LINKER = ~/git/Polygeist/mlir-build/bin/clang++
 LINKER_FLAGS = -lcudart_static -ldl -lrt -lpthread -lm -L/usr/local/cuda-11.2/lib64/ -L/home/wmoses/git/Polygeist/mlir-build/lib
 SYSTEM_LINKER_FLAGS := $(LINKER_FLAGS) -fopenmp
 
-CC_FLAGS = --function=* -resource-dir=/home/wmoses/git/Polygeist/mlir-build/lib/clang/14.0.0/ -I/home/wmoses/git/Polygeist/mlir-build/projects/openmp/runtime/src/
+CC_FLAGS = -O2 --function=* -resource-dir=/home/wmoses/git/Polygeist/mlir-build/lib/clang/14.0.0/ -I/home/wmoses/git/Polygeist/mlir-build/projects/openmp/runtime/src/
 CXX_FLAGS = $(CC_FLAGS)
 #CC_FLAGS = -resource-dir=/scr0/ivan/src/Polygeist/mlir-build/lib/clang/14.0.0/ --cuda-gpu-arch=sm_60 --cuda-path=/opt/cuda-10.2/ --cuda-lower --cpuify="distribute"
 #CXX_FLAGS = -resource-dir=/scr0/ivan/src/Polygeist/mlir-build/lib/clang/14.0.0/ --cuda-gpu-arch=sm_60 --cuda-path=/opt/cuda-10.2/ --cuda-lower --cpuify="distribute"

diff --git a/cuda/bfs/bfs.cu b/cuda/bfs/bfs.cu
@@ -27,8 +27,6 @@
 
 #define MAX_THREADS_PER_BLOCK 512
 
-int no_of_nodes;
-int edge_list_size;
 FILE *fp;
 
 #ifdef TIMING
@@ -60,8 +58,6 @@ void BFSGraph(int argc, char** argv);
 ////////////////////////////////////////////////////////////////////////////////
 int main( int argc, char** argv) 
 {
-	no_of_nodes=0;
-	edge_list_size=0;
 	BFSGraph( argc, argv);
 }
 
@@ -75,7 +71,8 @@ fprintf(stderr,"Usage: %s <input_file>\n", argv[0]);
 ////////////////////////////////////////////////////////////////////////////////
 void BFSGraph( int argc, char** argv) 
 {
-
+	int no_of_nodes=0;
+	int edge_list_size=0;
     char *input_f;
 	if(argc!=2){
 	Usage(argc, argv);

diff --git a/cuda/cfd/Makefile b/cuda/cfd/Makefile
@@ -22,17 +22,17 @@ euler3d: euler3d.o
 
 
 euler3d.o: euler3d.cu
-	$(NVCC) $(KERNEL_DIM) -O2 -c euler3d.cu -o euler3d.o -I$(CUDA_SDK_PATH)/common/inc  -L$(CUDA_SDK_PATH)/lib $(CUTIL_LIB) -lstdc++
+	$(NVCC) $(KERNEL_DIM) -O2 -c euler3d.cu -o euler3d.o -I$(CUDA_SDK_PATH)/common/inc  -L$(CUDA_SDK_PATH)/lib $(CUTIL_LIB) -lstdc++ -I ../hybridsort
 
 euler3d_double: euler3d_double.cu
-	$(NVCC) -Xptxas -v -O3 euler3d_double.cu -o euler3d_double -I$(CUDA_SDK_PATH)/common/inc  -L$(CUDA_SDK_PATH)/lib $(CUTIL_LIB)
+	$(NVCC) -Xptxas -v -O3 euler3d_double.cu -o euler3d_double -I$(CUDA_SDK_PATH)/common/inc  -L$(CUDA_SDK_PATH)/lib $(CUTIL_LIB) -I ../hybridsort
 
 
 pre_euler3d: pre_euler3d.cu
-	$(NVCC) -Xptxas -v -O3 pre_euler3d.cu -o pre_euler3d -I$(CUDA_SDK_PATH)/common/inc  -L$(CUDA_SDK_PATH)/lib $(CUTIL_LIB)
+	$(NVCC) -Xptxas -v -O3 pre_euler3d.cu -o pre_euler3d -I$(CUDA_SDK_PATH)/common/inc  -L$(CUDA_SDK_PATH)/lib $(CUTIL_LIB) -I ../hybridsort
 
 pre_euler3d_double: pre_euler3d_double.cu
-	$(NVCC) -Xptxas -v -O3 pre_euler3d_double.cu -o pre_euler3d_double -I$(CUDA_SDK_PATH)/common/inc  -L$(CUDA_SDK_PATH)/lib $(CUTIL_LIB)
+	$(NVCC) -Xptxas -v -O3 pre_euler3d_double.cu -o pre_euler3d_double -I$(CUDA_SDK_PATH)/common/inc  -L$(CUDA_SDK_PATH)/lib $(CUTIL_LIB) -I ../hybridsort
 
 
 clean: