diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index a5178e8f34c8..3f274ad99f93 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: - - glados - - intel - - x86 + runs-on: ubuntu-latest + #- glados + #- intel + #- x86 steps: - name: Print inputs run: | @@ -46,10 +46,10 @@ jobs: build-test: name: Build and test - runs-on: - - glados - - intel - - x86 + runs-on: ubuntu-latest + #- glados + #- intel + #- x86 strategy: matrix: python: ['3.11'] @@ -69,8 +69,9 @@ 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 + git submodule update --init --recursive - name: Install Triton run: | diff --git a/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp b/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp index 99962da6546a..27dce7a33973 100644 --- a/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp +++ b/third_party/cpu/lib/TritonCPUToLLVM/FuncOpToLLVM.cpp @@ -104,12 +104,9 @@ 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;