Merge branch 'main' into pascal-f16tof32-upcast

triton-lang · May 10, 2024 · 13dea63 · 13dea63
2 parents dd5e1d1 + 77195bc
commit 13dea63
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cmake/llvm-hash.txt b/cmake/llvm-hash.txt
@@ -1 +1 @@
-ed4e505c219fe6c7464ea5a056e90d8cd94c7332
+3a8316216807d64a586b971f51695e23883331f7
diff --git a/lib/Conversion/TritonGPUToLLVM/Utility.cpp b/lib/Conversion/TritonGPUToLLVM/Utility.cpp
@@ -165,7 +165,7 @@ applyLinearLayout(Location loc, RewriterBase &rewriter,
   for (auto [inDimName, idx] : indices) {
     if (auto constant = dyn_cast<LLVM::ConstantOp>(idx.getDefiningOp())) {
       constantIns.push_back(
-          {inDimName, constant.getValue().cast<IntegerAttr>().getInt()});
+          {inDimName, cast<IntegerAttr>(constant.getValue()).getInt()});
     } else {
       constantIns.push_back({inDimName, 0});
     }

diff --git a/lib/Dialect/TritonGPU/Transforms/Pipeliner/MatmulLoopPipeline.cpp b/lib/Dialect/TritonGPU/Transforms/Pipeliner/MatmulLoopPipeline.cpp
@@ -1068,7 +1068,7 @@ createAsyncOps(scf::ForOp &forOp, CoarseSchedule &schedule,
 static void invalidateBarriers(OpBuilder &builder,
                                SmallVector<Value> &barriers) {
   for (Value barrier : barriers) {
-    int numBarriers = barrier.getType().cast<tt::MemDescType>().getShape()[0];
+    int numBarriers = cast<tt::MemDescType>(barrier.getType()).getShape()[0];
     for (int i = 0; i < numBarriers; i++) {
       Value idx = builder.create<arith::ConstantIntOp>(barrier.getLoc(), i, 32);
       tt::MemDescType barrierTy = tt::MemDescType::get(

diff --git a/lib/Target/LLVMIR/LLVMDIScope.cpp b/lib/Target/LLVMIR/LLVMDIScope.cpp
@@ -88,7 +88,7 @@ struct LLVMDIScopePass : public LLVMDIScopeBase<LLVMDIScopePass> {
       distinctId = mlir::DistinctAttr::create(mlir::UnitAttr::get(context));
       if (!compileUnitAttr) {
         compileUnitAttr = LLVM::DICompileUnitAttr::get(
-            context, distinctId, llvm::dwarf::DW_LANG_C, fileAttr,
+            distinctId, llvm::dwarf::DW_LANG_C, fileAttr,
             StringAttr::get(context, "triton"),
             /*isOptimized=*/true, LLVM::DIEmissionKind::LineTablesOnly);
       }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ed4e505c219fe6c7464ea5a056e90d8cd94c7332
		3a8316216807d64a586b971f51695e23883331f7