Update llvm sha and CI scripts cleanup (#6)

Signed-off-by: Ivan Butygin <[email protected]>

Author: Hardcode84

.github/workflows/build.yml

@@ -18,55 +18,54 @@ jobs:
   build_llvm_linux:
     name: Builds Linux LLVM/MLIR
     runs-on: ubuntu-22.04
-    defaults:
-      run:
-        shell: bash -el {0}
-    timeout-minutes: 420
+    timeout-minutes: 240
 
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup env
-        run: |
-          sudo apt update
-          sudo apt install -y ninja-build cmake clang lld
-          pip install lit
-
       - name: Setup Cache Vars
         run: |
-          echo 'LLVM_SHA<<EOF' >> $GITHUB_ENV
-          cat $GITHUB_WORKSPACE/$LLVM_SHA_FILE >> $GITHUB_ENV
-          echo 'EOF' >> $GITHUB_ENV
+          echo "LLVM_SHA=$(cat $GITHUB_WORKSPACE/$LLVM_SHA_FILE)" >> $GITHUB_ENV
 
-      - name: Cache LLLVM-MLIR
+      - name: Cache LLVM-MLIR
         id: cache-llvm-mlir
         uses: actions/cache@v3
         with:
           path: |
-            /home/runner/work/llvm-mlir/_mlir_install/**
+            llvm-mlir/_mlir_install/**
           key: ${{ runner.os }}-build-llvm-${{ env.LLVM_CACHE_NUMBER }}-${{ env.LLVM_SHA }}
 
+      - name: Setup env
+        if: steps.cache-llvm-mlir.outputs.cache-hit != 'true'
+        run: |
+          sudo apt update
+          sudo apt install -y ninja-build cmake clang lld
+          pip install lit
+
+      - name: Checkout LLVM
+        if: steps.cache-llvm-mlir.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: llvm/llvm-project
+          ref: ${{ env.LLVM_SHA }}
+          path: llvm-mlir/llvm-project
+          fetch-depth: 0
+
       - name: Build LLVM-MLIR
         if: steps.cache-llvm-mlir.outputs.cache-hit != 'true'
-        shell: bash -l {0}
-        timeout-minutes: 420
         run: |
-          mkdir -p /home/runner/work/llvm-mlir
-          pushd /home/runner/work/llvm-mlir
+          pushd ${GITHUB_WORKSPACE}/llvm-mlir
           echo "INFO: Need to rebuild LLVM-MLIR. Previous installation for MLIR not found"
           np=`nproc`
           echo "INFO: nproc $np"
-          git clone https://github.com/llvm/llvm-project
-          cd llvm-project
-          git checkout $LLVM_SHA
           mkdir _build
           cd _build
           export CC=clang
           export CXX=clang++
-          cmake ../llvm                                                        \
+          cmake ../llvm-project/llvm                                           \
             -GNinja                                                            \
             -DCMAKE_BUILD_TYPE=Release                                         \
             -DLLVM_ENABLE_PROJECTS="mlir"                                      \
@@ -77,21 +76,18 @@ jobs:
             -DLLVM_ENABLE_ZSTD=OFF                                             \
             -DMLIR_INCLUDE_TESTS=OFF                                           \
             -DLLVM_USE_LINKER=lld                                              \
-            -DLLVM_DISTRIBUTION_COMPONENTS="llvm-headers;llvm-libraries;cmake-exports;FileCheck;count;not;mlir-headers;mlir-libraries;mlir-cmake-exports;mlir-tblgen;" \
-            -DCMAKE_INSTALL_PREFIX=/home/runner/work/llvm-mlir/_mlir_install
+            -DLLVM_DISTRIBUTION_COMPONENTS="llvm-headers;llvm-libraries;cmake-exports;FileCheck;count;not;mlir-headers;mlir-libraries;mlir-cmake-exports;mlir-tblgen" \
+            -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/llvm-mlir/_mlir_install
           ninja install-distribution-stripped
-          cp bin/FileCheck /home/runner/work/llvm-mlir/_mlir_install/bin/
-          cp bin/count /home/runner/work/llvm-mlir/_mlir_install/bin/
-          cp bin/not /home/runner/work/llvm-mlir/_mlir_install/bin/
+          cp bin/FileCheck ${GITHUB_WORKSPACE}/llvm-mlir/_mlir_install/bin/
+          cp bin/count ${GITHUB_WORKSPACE}/llvm-mlir/_mlir_install/bin/
+          cp bin/not ${GITHUB_WORKSPACE}/llvm-mlir/_mlir_install/bin/
           popd
 
   test_linux:
     name: "Linux: Run water tests"
     runs-on: ubuntu-22.04
-    defaults:
-      run:
-        shell: bash -el {0}
-    timeout-minutes: 420
+    timeout-minutes: 60
     needs: build_llvm_linux
 
     steps:
@@ -108,23 +104,21 @@ jobs:
 
       - name: Setup Cache Vars
         run: |
-          echo 'LLVM_SHA<<EOF' >> $GITHUB_ENV
-          cat $GITHUB_WORKSPACE/$LLVM_SHA_FILE >> $GITHUB_ENV
-          echo 'EOF' >> $GITHUB_ENV
+          echo "LLVM_SHA=$(cat $GITHUB_WORKSPACE/$LLVM_SHA_FILE)" >> $GITHUB_ENV
 
-      - name: Cache LLLVM-MLIR
+      - name: Cache LLVM-MLIR
         id: cache-llvm-mlir
         uses: actions/cache@v3
         with:
           path: |
-            /home/runner/work/llvm-mlir/_mlir_install/**
+            llvm-mlir/_mlir_install/**
           key: ${{ runner.os }}-build-llvm-${{ env.LLVM_CACHE_NUMBER }}-${{ env.LLVM_SHA }}
 
 
       - name: Build water
         run: |
           export EXTERNAL_LIT=${GITHUB_WORKSPACE}/scripts/runlit.py
-          export LLVM_DIR=/home/runner/work/llvm-mlir/_mlir_install
+          export LLVM_DIR=${GITHUB_WORKSPACE}/llvm-mlir/_mlir_install
           mkdir -p cmake_build
           cd cmake_build
           export CC=clang

lib/Transforms/AccessCheckers.cpp

@@ -108,7 +108,7 @@ static LogicalResult insertInBoundsAssertions(OpBuilder &builder, OpTy op,
   Value zero = b.createOrFold<arith::ConstantIndexOp>(0);
   Value totalCheck =
       checkKind == CheckKind::Combined
-          ? b.createOrFold<arith::ConstantIntOp>(1, b.getI1Type())
+          ? b.createOrFold<arith::ConstantIntOp>(b.getI1Type(), 1)
           : nullptr;
   for (unsigned i = 0, e = op.getMemRefType().getRank(); i < e; ++i) {
     Value index = b.createOrFold<arith::ConstantIndexOp>(i);
@@ -243,7 +243,7 @@ static Value createDummyValue(OpBuilder &builder, Location loc, Type type) {
   }
   if (auto floatType = dyn_cast<FloatType>(type)) {
     return builder.create<arith::ConstantFloatOp>(
-        loc, llvm::APFloat::getZero(floatType.getFloatSemantics()), floatType);
+        loc, floatType, llvm::APFloat::getZero(floatType.getFloatSemantics()));
   }
   if (auto vecType = dyn_cast<VectorType>(type)) {
     Value element = createDummyValue(builder, loc, vecType.getElementType());

llvm-sha.txt

@@ -1 +1 @@
-227f759644bbc208045178c54633df241f27da7f
+c73e5e3e209cca229f24645b74ce4944b7e1016f