Fix build and test failures from 55cea61

Signed-off-by: Whitney Tsang <[email protected]>

Author: whitneywhtsang

test/Conversion/intel/tritongpu_to_gen.mlir

@@ -624,15 +624,15 @@ module attributes {"ttg.num-ctas" = 1 : i32, "ttg.num-warps" = 4 : i32} {
     // CHECK-NEXT: llvm.mlir.constant(1 : i32) : i32
     // CHECK-NEXT: llvm.mlir.constant(32 : i32) : i32
     // CHECK-NEXT: llvm.mlir.constant(512 : i32) : i32
-    // CHECK-NEXT: llvm.add
-    // CHECK-NEXT: llvm.add
     // CHECK-NEXT: llvm.mlir.constant(0 : i32) : i32
     // CHECK-NEXT: llvm.mul
     // CHECK-NEXT: llvm.add
     // CHECK-NEXT: llvm.mul
     // CHECK-NEXT: llvm.add
     // CHECK-NEXT: llvm.mul
     // CHECK-NEXT: llvm.add
+    // CHECK-NEXT: llvm.add
+    // CHECK-NEXT: llvm.add
     // CHECK-NEXT: llvm.getelementptr
     %index = arith.constant 1 : i32
     %zero = arith.constant 0 : i32

third_party/intel/lib/Analysis/Utility.cpp

@@ -175,12 +175,12 @@ bool cvtIsSubGroupShuffle(RankedTensorType srcTy, RankedTensorType dstTy) {
   StringAttr kBlock = str_attr("block");
 
   std::optional<LinearLayout> srcLayout =
-      toLinearLayout(srcTy.getShape(), srcTy.getEncoding());
+      toLinearLayout(srcTy.getShape(), srcTy.getEncoding(), {});
   if (!srcLayout)
     return false;
 
   std::optional<LinearLayout> dstLayout =
-      toLinearLayout(dstTy.getShape(), dstTy.getEncoding());
+      toLinearLayout(dstTy.getShape(), dstTy.getEncoding(), {});
   if (!dstLayout)
     return false;
 
@@ -263,12 +263,12 @@ bool cvtIsSubGroupTranspose(RankedTensorType srcTy, RankedTensorType dstTy) {
   StringAttr kBlock = str_attr("block");
 
   std::optional<LinearLayout> srcLayout =
-      toLinearLayout(srcTy.getShape(), srcTy.getEncoding());
+      toLinearLayout(srcTy.getShape(), srcTy.getEncoding(), {});
   if (!srcLayout)
     return false;
 
   std::optional<LinearLayout> dstLayout =
-      toLinearLayout(dstTy.getShape(), dstTy.getEncoding());
+      toLinearLayout(dstTy.getShape(), dstTy.getEncoding(), {});
   if (!dstLayout)
     return false;
 

third_party/intel/lib/Dialect/TritonIntelGPU/IR/Dialect.cpp

@@ -1100,8 +1100,8 @@ struct TritonIntelGPUInferLayoutInterface
       return success();
     }
     // Check whether the encodings are structurally the same.
-    const auto &expectedLL = triton::gpu::toLinearLayout(shape, expected);
-    const auto &gotLL = triton::gpu::toLinearLayout(shape, got);
+    const auto &expectedLL = triton::gpu::toLinearLayout(shape, expected, {});
+    const auto &gotLL = triton::gpu::toLinearLayout(shape, got, {});
     if (expectedLL != gotLL) {
       return emitOptionalError(loc, "Expected result encoding ", expected,
                                " but was ", got);
@@ -1123,7 +1123,7 @@ struct TritonIntelGPUInferLayoutInterface
     // Once LinearLayouts are more widely used, we can remove
     // inferReshapeOpLegacyEncoding and simply use LLs.
     auto *ctx = getContext();
-    auto src = toLinearLayout(srcShape, srcEnc);
+    auto src = toLinearLayout(srcShape, srcEnc, {});
 
     if (product(srcShape) != product(dstShape)) {
       return emitOptionalError(loc, "numel of dst shape does not match "
@@ -1136,7 +1136,7 @@ struct TritonIntelGPUInferLayoutInterface
          llvm::zip(standardOutDimNames(ctx, newRank), dstShape)) {
       newOutDims.emplace_back(dim, size);
     }
-    auto srcOutDims = to_vector(src.getOutDimNames());
+    auto srcOutDims = llvm::to_vector(src.getOutDimNames());
     // reshapeOp assumes minor-to-major, so we need to transpose the out dims
     // before the reshape
     std::reverse(srcOutDims.begin(), srcOutDims.end());

third_party/intel/lib/TritonIntelGPUToLLVM/ConvertLayoutOpToLLVM.cpp

@@ -29,9 +29,9 @@ struct ConvertLayoutOpUsingLinearLayoutsConversion
 
     LinearLayout conversion = minimalCvtLayout(srcTy, dstTy);
     LinearLayout srcLayout =
-        toLinearLayout(srcTy.getShape(), srcTy.getEncoding());
+        toLinearLayout(srcTy.getShape(), srcTy.getEncoding(), {});
     LinearLayout dstLayout =
-        toLinearLayout(dstTy.getShape(), dstTy.getEncoding());
+        toLinearLayout(dstTy.getShape(), dstTy.getEncoding(), {});
 
     StringAttr kLane = str_attr("lane");