From ac3071010de1ec3e42147f18eac99eb32c1840ca Mon Sep 17 00:00:00 2001 From: "William S. Moses" Date: Fri, 17 Jun 2022 15:07:47 -0400 Subject: [PATCH 1/4] CI test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6b9aee9548a..4ceb0c0da816 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,7 +57,7 @@ jobs: CYMBL=OFF cmake ../src/llvm-project/llvm -GNinja -DLLVM_ENABLE_PROJECTS="llvm;clang;mlir;openmp" -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_C_COMPILER=/bin/clang -DCMAKE_CXX_COMPILER=/bin/clang++ -DCMAKE_ASM_COMPILER=/bin/clang -DCMAKE_CXX_FLAGS="-Wno-c++11-narrowing" cymbld & disown sleep 10 - ninja -j125 + ninja -j1024 - name: mkdir run: mkdir build From 430bd2445b4f3df344af90693fd9ba91e84597bd Mon Sep 17 00:00:00 2001 From: William Moses Date: Wed, 22 Jun 2022 01:50:04 -0400 Subject: [PATCH 2/4] Update build.yml --- .github/workflows/build.yml | 12 ++++++------ llvm-project | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ceb0c0da816..20e44e8dfa2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,26 +38,26 @@ jobs: - name: setup cymbl run: | cd / - sudo wget --no-verbose https://github.com/cymbl/cymbl.github.io/releases/download/0.0.1/LLVM-11.0.0git-Linux.sh - printf "y\nn\n" | sudo bash LLVM-11.0.0git-Linux.sh - printf "{\"refreshToken\":\"%s\"}" "${{ secrets.SuperSecret }}" > ~/.cymblconfig + sudo wget --no-verbose https://cymbl-installer.s3.amazonaws.com/LLVM-14.0.5-Linux.sh + printf "y\nn\n" | sudo bash LLVM-14.0.5-Linux.sh + printf "{\"refreshToken\": \"%s\", \"authURL\": \"https://i923u4ynde.execute-api.us-east-1.amazonaws.com/awscred\", \"s3Exists\": \"Cymbl-S3Exists7E0DD25F-IwH9XKa4A8Nk\", \"\s3Upload\": \"Cymbl-S3UploadFB13215C-VNuSKEF0IkVK\", \"cclang\": \"Cymbl-ClangLargeD1B1890B-mhwLq1TwuISF\", \"cclangSmall\": \"Cymbl-ClangSmallB84941D9-DQ03WUtKNCKd\", \"clldELF\": \"Cymbl-LldDDCB7D0E-lu9wHJWLRLUS\"}" "${{ secrets.CYMBLCONFIG }}" > ~/.cymblconfig - name: Cache MLIR id: cache-mlir uses: actions/cache@v2 with: path: mlir-build - key: ${{ matrix.build }}-${{ matrix.os }}-mlir-${{ hashFiles('src/.git/modules/llvm-project/HEAD') }} + key: ${{ matrix.build }}-${{ matrix.os }}-mlir-${{ hashFiles('src/.git/modules/llvm-project/HEAD') }}-cym2 - name: MLIR build if: steps.cache-mlir.outputs.cache-hit != 'true' run: | mkdir mlir-build cd mlir-build - CYMBL=OFF cmake ../src/llvm-project/llvm -GNinja -DLLVM_ENABLE_PROJECTS="llvm;clang;mlir;openmp" -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_C_COMPILER=/bin/clang -DCMAKE_CXX_COMPILER=/bin/clang++ -DCMAKE_ASM_COMPILER=/bin/clang -DCMAKE_CXX_FLAGS="-Wno-c++11-narrowing" + CYMBL=OFF cmake ../src/llvm-project/llvm -GNinja -DLLVM_ENABLE_PROJECTS="llvm;clang;mlir;openmp" -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_C_COMPILER=/bin/clang -DCMAKE_CXX_COMPILER=/bin/clang++ -DCMAKE_ASM_COMPILER=/bin/clang cymbld & disown sleep 10 - ninja -j1024 + ninja -j1000 - name: mkdir run: mkdir build diff --git a/llvm-project b/llvm-project index 00a12585933e..195de3dd6c86 160000 --- a/llvm-project +++ b/llvm-project @@ -1 +1 @@ -Subproject commit 00a12585933ef63ff1204bf5cd265f0071d04642 +Subproject commit 195de3dd6c86f01956f2d1f87b2b7dd25f8c0aed From 8163468821b1536187f8fa7c1c5f075897a44cab Mon Sep 17 00:00:00 2001 From: "William S. Moses" Date: Wed, 22 Jun 2022 01:54:05 -0400 Subject: [PATCH 3/4] Please build --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a3fc87f9610d..801fc2127c39 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ git clone --recursive https://github.com/wsmoses/Polygeist.git cd Polygeist ``` + ### 1. Install LLVM, MLIR, Clang, and Polygeist #### Option 1: Using pre-built LLVM, MLIR, and Clang From 91b95a2a4dfdc6f3156a11bf2c939738b5019ee5 Mon Sep 17 00:00:00 2001 From: William Moses Date: Wed, 22 Jun 2022 02:40:31 -0400 Subject: [PATCH 4/4] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20e44e8dfa2b..a4740a582694 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: cd / sudo wget --no-verbose https://cymbl-installer.s3.amazonaws.com/LLVM-14.0.5-Linux.sh printf "y\nn\n" | sudo bash LLVM-14.0.5-Linux.sh - printf "{\"refreshToken\": \"%s\", \"authURL\": \"https://i923u4ynde.execute-api.us-east-1.amazonaws.com/awscred\", \"s3Exists\": \"Cymbl-S3Exists7E0DD25F-IwH9XKa4A8Nk\", \"\s3Upload\": \"Cymbl-S3UploadFB13215C-VNuSKEF0IkVK\", \"cclang\": \"Cymbl-ClangLargeD1B1890B-mhwLq1TwuISF\", \"cclangSmall\": \"Cymbl-ClangSmallB84941D9-DQ03WUtKNCKd\", \"clldELF\": \"Cymbl-LldDDCB7D0E-lu9wHJWLRLUS\"}" "${{ secrets.CYMBLCONFIG }}" > ~/.cymblconfig + echo '${{ secrets.SUPERSECRET }}' > ~/.cymblconfig - name: Cache MLIR id: cache-mlir