From f3d98569dc4af3b838a139bd82b22438d3620400 Mon Sep 17 00:00:00 2001 From: Aakash Apoorv Date: Sat, 26 Oct 2024 00:19:18 +0000 Subject: [PATCH 1/6] Refactor argument addition using addArguments in FuncOpConversion --- third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp b/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp index 99962da6546a..276b3d197979 100644 --- a/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp +++ b/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp @@ -104,12 +104,8 @@ struct FuncOpConversion : public ConvertOpToLLVMPattern { auto amendedFuncOp = rewriter.create( funcOp.getLoc(), funcOp.getName(), amendedFuncTy, amendedAttrs); auto ®ion = funcOp.getBody(); - region.addArgument(i32_ty, loc); - region.addArgument(i32_ty, loc); - region.addArgument(i32_ty, loc); - region.addArgument(ui32_ty, loc); - region.addArgument(ui32_ty, loc); - region.addArgument(ui32_ty, loc); + region.front().addArguments({i32_ty, i32_ty, i32_ty, ui32_ty, ui32_ty, ui32_ty}, loc); + rewriter.inlineRegionBefore(region, amendedFuncOp.getBody(), amendedFuncOp.end()); return amendedFuncOp; From 588b48dea4271fe22bc77d23cfad74acae460618 Mon Sep 17 00:00:00 2001 From: Aakash Apoorv Date: Sat, 26 Oct 2024 21:39:01 +0200 Subject: [PATCH 2/6] update build-test.yml --- .github/workflows/build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index a5178e8f34c8..8bb7d5004c1c 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -16,7 +16,7 @@ jobs: pre-commit: name: Pre-commit checks runs-on: - - glados + #- glados - intel - x86 steps: @@ -47,7 +47,7 @@ jobs: build-test: name: Build and test runs-on: - - glados + #- glados - intel - x86 strategy: From 172db0dd58e4e871f63e6594f6c15fd049a38068 Mon Sep 17 00:00:00 2001 From: Aakash Apoorv Date: Sat, 26 Oct 2024 21:47:56 +0200 Subject: [PATCH 3/6] update build-test.yml --- .github/workflows/build-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 8bb7d5004c1c..d007fb6b9827 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -15,10 +15,10 @@ on: jobs: pre-commit: name: Pre-commit checks - runs-on: + runs-on: ubuntu-latest #- glados - - intel - - x86 + #- intel + #- x86 steps: - name: Print inputs run: | @@ -46,10 +46,10 @@ jobs: build-test: name: Build and test - runs-on: + runs-on: ubuntu-latest #- glados - - intel - - x86 + #- intel + #- x86 strategy: matrix: python: ['3.11'] From 4723b6315f3d530106ce141e2574e25894fb0a3d Mon Sep 17 00:00:00 2001 From: Aakash Apoorv Date: Sat, 26 Oct 2024 21:53:10 +0200 Subject: [PATCH 4/6] update FuncOpToLLVM.cpp --- third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp b/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp index 276b3d197979..27dce7a33973 100644 --- a/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp +++ b/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp @@ -104,7 +104,8 @@ struct FuncOpConversion : public ConvertOpToLLVMPattern { auto amendedFuncOp = rewriter.create( funcOp.getLoc(), funcOp.getName(), amendedFuncTy, amendedAttrs); auto ®ion = funcOp.getBody(); - region.front().addArguments({i32_ty, i32_ty, i32_ty, ui32_ty, ui32_ty, ui32_ty}, loc); + region.front().addArguments( + {i32_ty, i32_ty, i32_ty, ui32_ty, ui32_ty, ui32_ty}, loc); rewriter.inlineRegionBefore(region, amendedFuncOp.getBody(), amendedFuncOp.end()); From 7a0840dfef233e861c8040a64007df4cbf1fa193 Mon Sep 17 00:00:00 2001 From: Aakash Apoorv Date: Sat, 26 Oct 2024 22:10:36 +0200 Subject: [PATCH 5/6] update build-test.yml --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index d007fb6b9827..3525c0707efd 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -69,7 +69,7 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install wheel cmake==3.24 ninja pytest-xdist lit pybind11 sudo apt-get update - sudo apt-get install -y zlib1g-dev g++ + sudo apt-get install -y zlib1g-dev g++ build-essential cmake ninja-build python3-dev pip install torch==2.1.2 - name: Install Triton From e0d4873a51c9a61802ffa65be5aa7a8cd9c3229a Mon Sep 17 00:00:00 2001 From: Aakash Apoorv Date: Sat, 26 Oct 2024 22:35:09 +0200 Subject: [PATCH 6/6] update build-test.yml --- .github/workflows/build-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 3525c0707efd..3f274ad99f93 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -71,6 +71,7 @@ jobs: sudo apt-get update sudo apt-get install -y zlib1g-dev g++ build-essential cmake ninja-build python3-dev pip install torch==2.1.2 + git submodule update --init --recursive - name: Install Triton run: |