Update cgeist

ivanradanov · Jun 25, 2022 · d3e7277 · d3e7277
1 parent 025fa7d
commit d3e7277
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/common/common.polygeist.host.make.config b/common/common.polygeist.host.make.config
@@ -1,50 +1,50 @@
 ifeq ($(CONFIG),1)
-CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distribute"
+CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="distribute"
 COMPILER_NAME=polygeist
 endif
 
 ifeq ($(CONFIG),2)
-CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distribute.mincut"
+CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="distribute.mincut"
 COMPILER_NAME=polygeist.mincut
 endif
 
 ifeq ($(CONFIG),3)
-CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distribute.mincut" -scal-rep=0 -raise-scf-to-affine
+CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="distribute.mincut" -scal-rep=0 -raise-scf-to-affine
 COMPILER_NAME=polygeist.mincut.raise-scf-to-affine.scal-rep=0
 endif
 
 ifeq ($(CONFIG),4)
-#CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distribute.mincut" -scal-rep=1 -raise-scf-to-affine
+#CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="distribute.mincut" -scal-rep=1 -raise-scf-to-affine
 #COMPILER_NAME=polygeist.mincut.raise-scf-to-affine.scal-rep=1
 endif
 
 ifeq ($(CONFIG),5)
-#CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="continuation"
+#CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="continuation"
 #COMPILER_NAME=polygeist.continuation
 endif
 
 ifeq ($(CONFIG),6)
-CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distribute.mincut" -openmp-opt=0
+CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="distribute.mincut" -openmp-opt=0
 COMPILER_NAME=polygeist.mincut.openmp-opt=0
 endif
 
 ifeq ($(CONFIG),7)
-CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distribute.mincut" -barrier-opt=0
+CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="distribute.mincut" -barrier-opt=0
 COMPILER_NAME=polygeist.mincut.barrier-opt=0
 endif
 
 ifeq ($(CONFIG),8)
-CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distribute.mincut" -barrier-opt=0 -scal-rep=0 -raise-scf-to-affine
+CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="distribute.mincut" -barrier-opt=0 -scal-rep=0 -raise-scf-to-affine
 COMPILER_NAME=polygeist.mincut.raise-scf-to-affine.scal-rep=0.barrier-opt=0
 endif
 
 ifeq ($(CONFIG),9)
-CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distribute.mincut" --inner-serialize=1
+CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="distribute.mincut" --inner-serialize=1
 COMPILER_NAME=polygeist.mincut.inner-serialize=1
 endif
 
 ifeq ($(CONFIG),10)
-CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* --cuda-lower --cpuify="distribute.mincut" -scal-rep=0 -raise-scf-to-affine --inner-serialize=1
+CC = $(POLYGEIST_DIR)/bin/cgeist --function=* --cuda-lower --cpuify="distribute.mincut" -scal-rep=0 -raise-scf-to-affine --inner-serialize=1
 COMPILER_NAME=polygeist.mincut.inner-serialize=1.raise-scf-to-affine.scal-rep=0
 endif
 

diff --git a/common/memkf02.polygeist.host.make.config b/common/memkf02.polygeist.host.make.config
@@ -1,5 +1,7 @@
-POLYGEIST_DIR=/scr/ivan/src/Polygeist/build.release/
-POLYGEIST_LLVM_DIR=/scr/ivan/src/Polygeist/mlir-build.release/
+#POLYGEIST_DIR=/scr/ivan/src/Polygeist/build.release/
+#POLYGEIST_LLVM_DIR=/scr/ivan/src/Polygeist/mlir-build.release/
+POLYGEIST_DIR=/scr/ivan/src/Polygeist/build.debug/
+POLYGEIST_LLVM_DIR=/scr/ivan/src/Polygeist/mlir-build.debug/
 CUDA_PATH = /scr/ivan/cuda-10.2/
 CUDA_SAMPLES_PATH = /scr/ivan/cuda-10.2/samples/
 CPUCUDA_BUILD_DIR = /scr/ivan/src/cpucuda_runtime/build/

diff --git a/common/memkf02.polygeist.openmp.host.make.config b/common/memkf02.polygeist.openmp.host.make.config
@@ -1,18 +1,18 @@
-POLYGEIST_DIR=/scr/ivan/src/Polygeist/build.release/
-POLYGEIST_LLVM_DIR=/scr/ivan/src/Polygeist/mlir-build.release/
-#POLYGEIST_DIR=/scr/ivan/src/Polygeist/build.debug/
-#POLYGEIST_LLVM_DIR=/scr/ivan/src/Polygeist/mlir-build.debug/
+#POLYGEIST_DIR=/scr/ivan/src/Polygeist/build.release/
+#POLYGEIST_LLVM_DIR=/scr/ivan/src/Polygeist/mlir-build.release/
+POLYGEIST_DIR=/scr/ivan/src/Polygeist/build.debug/
+POLYGEIST_LLVM_DIR=/scr/ivan/src/Polygeist/mlir-build.debug/
 
-CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=*
+CC = $(POLYGEIST_DIR)/bin/cgeist --function=*
 COMPILER_NAME=openmp.polygeist
 
-#CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* -scal-rep=0 -raise-scf-to-affine
+#CC = $(POLYGEIST_DIR)/bin/cgeist --function=* -scal-rep=0 -raise-scf-to-affine
 #COMPILER_NAME=openmp.polygeist.raise-scf-to-affine.scal-rep=0
 
-#CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* -scal-rep=1 -raise-scf-to-affine
+#CC = $(POLYGEIST_DIR)/bin/cgeist --function=* -scal-rep=1 -raise-scf-to-affine
 #COMPILER_NAME=openmp.polygeist.raise-scf-to-affine.scal-rep=1
 
-#CC = $(POLYGEIST_DIR)/bin/mlir-clang --function=* -openmp-opt=0
+#CC = $(POLYGEIST_DIR)/bin/cgeist --function=* -openmp-opt=0
 #COMPILER_NAME=openmp.polygeist.openmp-opt=0
 
 CXX := $(CC)

diff --git a/common/openmp.make.config b/common/openmp.make.config
@@ -5,7 +5,7 @@ current_dir := $(dir $(mkfile_path))
 include $(current_dir)/openmp.host.make.config
 
 # include the timing header
-FLAGS_TO_ADD = -I$(current_dir)/ -include my_timing.h
+FLAGS_TO_ADD = -I$(current_dir)/ -include my_timing.h -include my_verification.h
 FLAGS_TO_ADD += -D_MY_IS_NOT_CUDA_
 FLAGS_TO_ADD += -D_MY_COMPILER_NAME_=\"$(COMPILER_NAME)\"