Rename mlir-clang to cgeist

.github/workflows/build.yml

@@ -66,8 +66,8 @@ jobs:
         cd build
         ls ../mlir-build/lib/cmake/clang
         cmake ../src/ -GNinja -DMLIR_DIR=`pwd`/../mlir-build/lib/cmake/mlir -DLLVM_EXTERNAL_LIT=`pwd`/../mlir-build/bin/llvm-lit -DClang_DIR=`pwd`/../mlir-build/lib/cmake/clang -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_C_COMPILER=${{matrix.compiler}} -DCMAKE_CXX_COMPILER=${{matrix.cxxcompiler}}
-    - name: test mlir-clang
+    - name: test cgeist
       run: |
         cd build
         ninja check-polygeist-opt
-        ninja check-mlir-clang
+        ninja check-cgeist

.github/workflows/clang-format.yml

@@ -16,6 +16,6 @@ jobs:
           fetch-depth: 1
     - uses: DoozyX/clang-format-lint-action@v0.11
       with:
-        exclude: './tools/mlir-clang/Test ./test'
+        exclude: './tools/cgeist/Test ./test'
         clangFormatVersion: 11
         style: llvm

README.md

@@ -7,7 +7,7 @@
 
 ### 0. Clone Polygeist
 ```sh
-git clone --recursive https://github.com/wsmoses/Polygeist.git
+git clone --recursive https://github.com/llvm/Polygeist
 cd Polygeist
 ```
 
@@ -41,7 +41,7 @@ cmake -G Ninja .. \
   -DLLVM_ENABLE_ASSERTIONS=ON \
   -DCMAKE_BUILD_TYPE=DEBUG
 ninja
-ninja check-mlir-clang
+ninja check-cgeist
 ```
 
 #### Option 2: Using unified LLVM, MLIR, Clang, and Polygeist build
@@ -60,5 +60,5 @@ cmake -G Ninja ../llvm-project/llvm \
   -DLLVM_ENABLE_ASSERTIONS=ON \
   -DCMAKE_BUILD_TYPE=DEBUG
 ninja
-ninja check-mlir-clang
+ninja check-cgeist
 ```

tools/CMakeLists.txt

@@ -1,2 +1,2 @@
 add_subdirectory(polygeist-opt)
-add_subdirectory(mlir-clang)
+add_subdirectory(cgeist)

tools/mlir-clang/CMakeLists.txt → tools/cgeist/CMakeLists.txt

@@ -17,8 +17,8 @@ set( LLVM_LINK_COMPONENTS
   Vectorize
 )
 
-add_clang_executable(mlir-clang
-  mlir-clang.cc
+add_clang_executable(cgeist
+  driver.cc
   Lib/CGStmt.cc
   "${LLVM_SOURCE_DIR}/../clang/tools/driver/cc1_main.cpp"
   "${LLVM_SOURCE_DIR}/../clang/tools/driver/cc1as_main.cpp"
@@ -31,18 +31,18 @@ add_clang_executable(mlir-clang
   Lib/TypeUtils.cc
   Lib/CGCall.cc 
 )
-install(TARGETS mlir-clang
+install(TARGETS cgeist
 EXPORT PolygeistTargets
 RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}
-COMPONENT mlir-clang)
+COMPONENT cgeist)
 
-target_include_directories(mlir-clang PRIVATE
+target_include_directories(cgeist PRIVATE
   "${LLVM_SOURCE_DIR}/../clang/include"
   "${CMAKE_BINARY_DIR}/tools/clang/include"
 )
 
-target_compile_definitions(mlir-clang PUBLIC -DLLVM_OBJ_ROOT="${LLVM_BINARY_DIR}")
-target_link_libraries(mlir-clang PRIVATE
+target_compile_definitions(cgeist PUBLIC -DLLVM_OBJ_ROOT="${LLVM_BINARY_DIR}")
+target_link_libraries(cgeist PRIVATE
   MLIRSCFTransforms
   MLIRPolygeist
 
@@ -75,5 +75,5 @@ target_link_libraries(mlir-clang PRIVATE
   clangLex
   clangSerialization
 )
-add_dependencies(mlir-clang MLIRPolygeistOpsIncGen MLIRPolygeistPassIncGen)
+add_dependencies(cgeist MLIRPolygeistOpsIncGen MLIRPolygeistPassIncGen)
 add_subdirectory(Test)

tools/mlir-clang/Test/CMakeLists.txt → tools/cgeist/Test/CMakeLists.txt

@@ -11,20 +11,20 @@ configure_lit_site_cfg(
 list(APPEND MLIR_CLANG_TEST_DEPS
   llvm-config 
   FileCheck count not
-  mlir-clang
+  cgeist
   split-file
   clang
   )
 
-add_lit_testsuite(check-mlir-clang "Running the clang-to-mlir regression tests"
+add_lit_testsuite(check-cgeist "Running the clang-to-mlir regression tests"
   ${CMAKE_CURRENT_BINARY_DIR} 
   DEPENDS ${MLIR_CLANG_TEST_DEPS}
   )
 
-add_lit_testsuite(check-mlir-clang-single "Running the clang-to-mlir regression tests"
+add_lit_testsuite(check-cgeist-single "Running the clang-to-mlir regression tests"
   ${CMAKE_CURRENT_BINARY_DIR} 
   DEPENDS ${MLIR_CLANG_TEST_DEPS}
   ARGS -j 1
   )
 
-set_target_properties(check-mlir-clang PROPERTIES FOLDER "clang-to-mlir tests")
+set_target_properties(check-cgeist PROPERTIES FOLDER "clang-to-mlir tests")

tools/mlir-clang/Test/Verification/affun.c → tools/cgeist/Test/Verification/affun.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=okernel_2mm -S | FileCheck %s
+// RUN: cgeist %s --function=okernel_2mm -S | FileCheck %s
 
 void okernel_2mm(unsigned int ni,
                  double *tmp) {

tools/mlir-clang/Test/Verification/alignof.cpp → tools/cgeist/Test/Verification/alignof.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang -std=c++11 %s --function=* -S | FileCheck %s
+// RUN: cgeist -std=c++11 %s --function=* -S | FileCheck %s
 
 struct Meta {
     float* f;

tools/mlir-clang/Test/Verification/arrayconsllvm.cpp → tools/cgeist/Test/Verification/arrayconsllvm.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 struct AIntDivider {
     AIntDivider() : divisor(3) {}

tools/mlir-clang/Test/Verification/arrayconsmemref.cpp → tools/cgeist/Test/Verification/arrayconsmemref.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 struct AIntDivider {
     AIntDivider() : divisor(3) {}

tools/mlir-clang/Test/Verification/arrayconsmemrefinner.cpp → tools/cgeist/Test/Verification/arrayconsmemrefinner.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 struct AIntDivider {
     AIntDivider() : divisor(3) {}

tools/mlir-clang/Test/Verification/base_nostructabi.cpp → tools/cgeist/Test/Verification/base_nostructabi.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* --struct-abi=0 -memref-abi=0 -S | FileCheck %s
+// RUN: cgeist %s --function=* --struct-abi=0 -memref-abi=0 -S | FileCheck %s
 
 void run0(void*);
 void run1(void*);

tools/mlir-clang/Test/Verification/base_with_virt.cpp → tools/cgeist/Test/Verification/base_with_virt.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 class M {
 };

tools/mlir-clang/Test/Verification/base_with_virt2.cpp → tools/cgeist/Test/Verification/base_with_virt2.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 class M {
 };

tools/mlir-clang/Test/Verification/caff.cpp → tools/cgeist/Test/Verification/caff.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 struct AOperandInfo {
   void* data;

tools/mlir-clang/Test/Verification/call.c → tools/cgeist/Test/Verification/call.c

@@ -1,5 +1,5 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
-// RUN: mlir-clang %s --function=* -S -memref-fullrank | FileCheck %s --check-prefix=FULLRANK
+// RUN: cgeist %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S -memref-fullrank | FileCheck %s --check-prefix=FULLRANK
 
 void sub0(int a[2]);
 void sub(int a[2]) { a[2]++; }

tools/mlir-clang/Test/Verification/calloc.c → tools/cgeist/Test/Verification/calloc.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 void* calloc(unsigned long a, unsigned long b);
 

tools/mlir-clang/Test/Verification/capture.cpp → tools/cgeist/Test/Verification/capture.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 extern "C" {
 

tools/mlir-clang/Test/Verification/charswitch.cpp → tools/cgeist/Test/Verification/charswitch.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=foo -S | FileCheck %s
+// RUN: cgeist %s --function=foo -S | FileCheck %s
 
 extern "C" {
 int foo(char t) {

tools/mlir-clang/Test/Verification/clangbuiltin.cpp → tools/cgeist/Test/Verification/clangbuiltin.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 #include <utility>
 

tools/mlir-clang/Test/Verification/classrefmem.cpp → tools/cgeist/Test/Verification/classrefmem.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 extern int& moo;
 void oadd(int& x) {

tools/mlir-clang/Test/Verification/combif.c → tools/cgeist/Test/Verification/combif.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 // TODO handle negation on if combine
 // TODO remove unused cyclic phi

tools/mlir-clang/Test/Verification/cond.c → tools/cgeist/Test/Verification/cond.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s %stdinclude --function=set -S | FileCheck %s
+// RUN: cgeist %s %stdinclude --function=set -S | FileCheck %s
 
 #include <stdio.h>
 #include <unistd.h>

tools/mlir-clang/Test/Verification/cond2.c → tools/cgeist/Test/Verification/cond2.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s %stdinclude --function=set -S | FileCheck %s
+// RUN: cgeist %s %stdinclude --function=set -S | FileCheck %s
 
 #include <stdio.h>
 #include <unistd.h>

tools/mlir-clang/Test/Verification/consabi.cpp → tools/cgeist/Test/Verification/consabi.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 class D {
   double a;

tools/mlir-clang/Test/Verification/constexpr.cpp → tools/cgeist/Test/Verification/constexpr.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 constexpr int num = 10 + 4;
 
 int sum(int*);

tools/mlir-clang/Test/Verification/continue.c → tools/cgeist/Test/Verification/continue.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 int get();
 void other();

tools/mlir-clang/Test/Verification/cout.cpp → tools/cgeist/Test/Verification/cout.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 // XFAIL: *
 #include <iostream>
 

tools/mlir-clang/Test/Verification/cudaglobalcodegen.cu → tools/cgeist/Test/Verification/cudaglobalcodegen.cu

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --cuda-gpu-arch=sm_60 -nocudalib -nocudainc %resourcedir --function=* -S | FileCheck %s
+// RUN: cgeist %s --cuda-gpu-arch=sm_60 -nocudalib -nocudainc %resourcedir --function=* -S | FileCheck %s
 
 #include "Inputs/cuda.h"
 

tools/mlir-clang/Test/Verification/der.c → tools/cgeist/Test/Verification/der.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=kernel_deriche -S | FileCheck %s
+// RUN: cgeist %s --function=kernel_deriche -S | FileCheck %s
 
 float kernel_deriche() {
     float a2, a6;

tools/mlir-clang/Test/Verification/deref.c → tools/cgeist/Test/Verification/deref.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=kernel_deriche -S | FileCheck %s
+// RUN: cgeist %s --function=kernel_deriche -S | FileCheck %s
 
 int deref(int a);
 

tools/mlir-clang/Test/Verification/derived.cpp → tools/cgeist/Test/Verification/derived.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 struct A {
     int x;

tools/mlir-clang/Test/Verification/dynalloc.c → tools/cgeist/Test/Verification/dynalloc.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=create_matrix -S | FileCheck %s
+// RUN: cgeist %s --function=create_matrix -S | FileCheck %s
 
 void create_matrix(float *m, int size) {
   float coe[2 * size + 1];

tools/mlir-clang/Test/Verification/ext.c → tools/cgeist/Test/Verification/ext.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 int c2i(char x) {
     return x;

tools/mlir-clang/Test/Verification/ext_vector_type.cpp → tools/cgeist/Test/Verification/ext_vector_type.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 typedef size_t size_t_vec __attribute__((ext_vector_type(3)));
 

tools/mlir-clang/Test/Verification/free.c → tools/cgeist/Test/Verification/free.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 void free(void*);
 

tools/mlir-clang/Test/Verification/freecst.c → tools/cgeist/Test/Verification/freecst.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 #include <stdlib.h>
     struct band {

tools/mlir-clang/Test/Verification/fscanf.c → tools/cgeist/Test/Verification/fscanf.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s %stdinclude --function=alloc -S | FileCheck %s
+// RUN: cgeist %s %stdinclude --function=alloc -S | FileCheck %s
 
 #include <stdio.h>
 #include <stdlib.h>

tools/mlir-clang/Test/Verification/fw.c → tools/cgeist/Test/Verification/fw.c

@@ -1,5 +1,5 @@
-// RUN: mlir-clang %s %stdinclude -S | FileCheck %s
-// RUN: mlir-clang %s %stdinclude  -S -memref-fullrank | FileCheck %s --check-prefix=FULLRANK
+// RUN: cgeist %s %stdinclude -S | FileCheck %s
+// RUN: cgeist %s %stdinclude  -S -memref-fullrank | FileCheck %s --check-prefix=FULLRANK
 
 #include <stdio.h>
 #include <unistd.h>

tools/mlir-clang/Test/Verification/fwfree.c → tools/cgeist/Test/Verification/fwfree.c

@@ -1,5 +1,5 @@
-// RUN: mlir-clang %s %stdinclude -S | FileCheck %s
-// RUN: mlir-clang %s %stdinclude -S -memref-fullrank | FileCheck %s --check-prefix=FULLRANK
+// RUN: cgeist %s %stdinclude -S | FileCheck %s
+// RUN: cgeist %s %stdinclude -S -memref-fullrank | FileCheck %s --check-prefix=FULLRANK
 
 #include <stdio.h>
 #include <unistd.h>

tools/mlir-clang/Test/Verification/gcd.c → tools/cgeist/Test/Verification/gcd.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=gcd -S | FileCheck %s
+// RUN: cgeist %s --function=gcd -S | FileCheck %s
 
 int gcd(int m, int n) {
   while (n > 0) {

tools/mlir-clang/Test/Verification/gettimeofday.c → tools/cgeist/Test/Verification/gettimeofday.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s %stdinclude --function=alloc -S | FileCheck %s
+// RUN: cgeist %s %stdinclude --function=alloc -S | FileCheck %s
 
 #include <time.h>
 #include <sys/time.h>

tools/mlir-clang/Test/Verification/globals.c → tools/cgeist/Test/Verification/globals.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=kernel_deriche -S | FileCheck %s
+// RUN: cgeist %s --function=kernel_deriche -S | FileCheck %s
 
 int local;
 int local_init = 4;

tools/mlir-clang/Test/Verification/hist.c → tools/cgeist/Test/Verification/hist.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 void histo_kernel(int i);
 

tools/mlir-clang/Test/Verification/ident.cpp → tools/cgeist/Test/Verification/ident.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 struct MOperandInfo {
   char device;

tools/mlir-clang/Test/Verification/ident2.cpp → tools/cgeist/Test/Verification/ident2.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 struct MOperandInfo {
   char device;

tools/mlir-clang/Test/Verification/ker.c → tools/cgeist/Test/Verification/ker.c

@@ -1,5 +1,5 @@
-// RUN: mlir-clang %s --function=kernel_deriche -S | FileCheck %s
-// RUN: mlir-clang %s --function=kernel_deriche -S -memref-fullrank | FileCheck %s --check-prefix=FULLRANK
+// RUN: cgeist %s --function=kernel_deriche -S | FileCheck %s
+// RUN: cgeist %s --function=kernel_deriche -S -memref-fullrank | FileCheck %s --check-prefix=FULLRANK
 
 int kernel_deriche(int a[30][40]) {
     a[3][5]++;

tools/mlir-clang/Test/Verification/label.c → tools/cgeist/Test/Verification/label.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 int fir (int d_i[1000], int idx[1000] ) {
 	int i;

tools/mlir-clang/Test/Verification/ler.c → tools/cgeist/Test/Verification/ler.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=kernel_deriche -S | FileCheck %s
+// RUN: cgeist %s --function=kernel_deriche -S | FileCheck %s
 
 int kernel_deriche(int *a) {
     a[3]++;

tools/mlir-clang/Test/Verification/loop.cpp → tools/cgeist/Test/Verification/loop.cpp

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=* -S | FileCheck %s
+// RUN: cgeist %s --function=* -S | FileCheck %s
 
 int MAX_DIMS;
 

tools/mlir-clang/Test/Verification/loopinc.c → tools/cgeist/Test/Verification/loopinc.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s --function=test -S | FileCheck %s
+// RUN: cgeist %s --function=test -S | FileCheck %s
 
 // TODO
 // XFAIL: * 

tools/mlir-clang/Test/Verification/lower-to-linalg-op.c → tools/cgeist/Test/Verification/lower-to-linalg-op.c

@@ -1,4 +1,4 @@
-// RUN: mlir-clang %s -S | FileCheck %s
+// RUN: cgeist %s -S | FileCheck %s
 
 #pragma lower_to(copy_op, "memref.copy") "input"(a), "output"(b)
 void copy_op(int b[3][3], int a[3][3]) {