openxla · cloudhan · Apr 11, 2023 · Apr 11, 2023 · Apr 4, 2023 · Mar 31, 2023
diff --git a/BUILD b/BUILD
diff --git a/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMBase.h b/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMBase.h
@@ -77,8 +77,8 @@ struct FuncOpConversionBase : public ConvertOpToLLVMPattern<triton::FuncOp> {
     auto varargsAttr = funcOp->getAttrOfType<BoolAttr>("func.varargs");
     TypeConverter::SignatureConversion result(funcOp.getNumArguments());
     auto llvmType = getTypeConverter()->convertFunctionSignature(
-        funcOp.getFunctionType(), varargsAttr && varargsAttr.getValue(), false,
-        result);
+        funcOp.getFunctionType(), varargsAttr && varargsAttr.getValue(),
+        /*useBarePtrCallConv=*/false, result);
     if (!llvmType)
       return nullptr;
 

diff --git a/lib/Dialect/TritonGPU/Transforms/Pipeline.cpp b/lib/Dialect/TritonGPU/Transforms/Pipeline.cpp
@@ -336,10 +336,6 @@ Value LoopPipeliner::getLoadMask(triton::LoadOp loadOp, Value mappedMask,
 }
 
 void LoopPipeliner::emitPrologue() {
-  // llvm::errs() << "loads to pipeline...:\n";
-  // for (Value load : loads)
-  //   llvm::errs() << load << "\n";
-
   OpBuilder builder(forOp);
   for (BlockArgument &arg : forOp.getRegionIterArgs()) {
     OpOperand &operand = forOp.getOpOperandForRegionIterArg(arg);
@@ -364,7 +360,7 @@ void LoopPipeliner::emitPrologue() {
     for (Operation &op : forOp.getLoopBody().front()) {
       if (depOps.contains(&op))
         orderedDeps.push_back(&op);
-      else if (loads.contains(op.getResult(0)))
+      else if (op.getNumResults() > 0 && loads.contains(op.getResult(0)))
         orderedDeps.push_back(&op);
     }
     assert(depOps.size() + loads.size() == orderedDeps.size() &&
@@ -578,7 +574,7 @@ scf::ForOp LoopPipeliner::createNewForOp() {
   for (Operation &op : forOp.getLoopBody().front()) {
     if (depOps.contains(&op))
       orderedDeps.push_back(&op);
-    else if (loads.contains(op.getResult(0)))
+    else if (op.getNumResults() > 0 && loads.contains(op.getResult(0)))
       orderedDeps.push_back(&op);
   }
   assert(depOps.size() + loads.size() == orderedDeps.size() &&

diff --git a/python/README.md b/python/README.md
diff --git a/python/examples/copy_strided.py b/python/examples/copy_strided.py
diff --git a/python/examples/empty.py b/python/examples/empty.py
diff --git a/python/setup.cfg b/python/setup.cfg
diff --git a/python/src/main.cc b/python/src/main.cc
diff --git a/python/test/unit/language/assert_helper.py b/python/test/unit/language/assert_helper.py
diff --git a/python/test/unit/language/print_helper.py b/python/test/unit/language/print_helper.py
diff --git a/python/test/unit/language/test_block_pointer.py b/python/test/unit/language/test_block_pointer.py