Fix build after e14ea66

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

Author: whitneywhtsang

third_party/intel/lib/Analysis/Utility.cpp

@@ -174,13 +174,11 @@ bool cvtIsSubGroupShuffle(RankedTensorType srcTy, RankedTensorType dstTy) {
   StringAttr kWarp = str_attr("warp");
   StringAttr kBlock = str_attr("block");
 
-  std::optional<LinearLayout> srcLayout =
-      toLinearLayout(srcTy.getShape(), srcTy.getEncoding(), {});
+  std::optional<LinearLayout> srcLayout = toLinearLayout(srcTy);
   if (!srcLayout)
     return false;
 
-  std::optional<LinearLayout> dstLayout =
-      toLinearLayout(dstTy.getShape(), dstTy.getEncoding(), {});
+  std::optional<LinearLayout> dstLayout = toLinearLayout(dstTy);
   if (!dstLayout)
     return false;
 
@@ -262,13 +260,11 @@ bool cvtIsSubGroupTranspose(RankedTensorType srcTy, RankedTensorType dstTy) {
   StringAttr kWarp = str_attr("warp");
   StringAttr kBlock = str_attr("block");
 
-  std::optional<LinearLayout> srcLayout =
-      toLinearLayout(srcTy.getShape(), srcTy.getEncoding(), {});
+  std::optional<LinearLayout> srcLayout = toLinearLayout(srcTy);
   if (!srcLayout)
     return false;
 
-  std::optional<LinearLayout> dstLayout =
-      toLinearLayout(dstTy.getShape(), dstTy.getEncoding(), {});
+  std::optional<LinearLayout> dstLayout = toLinearLayout(dstTy);
   if (!dstLayout)
     return false;
 

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

@@ -1094,8 +1094,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);
@@ -1117,7 +1117,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 "

third_party/intel/lib/TritonIntelGPUToLLVM/ConvertLayoutOpToLLVM.cpp

@@ -28,10 +28,8 @@ struct ConvertLayoutOpUsingLinearLayoutsConversion
     auto dstTy = op.getType();
 
     LinearLayout conversion = minimalCvtLayout(srcTy, dstTy);
-    LinearLayout srcLayout =
-        toLinearLayout(srcTy.getShape(), srcTy.getEncoding(), {});
-    LinearLayout dstLayout =
-        toLinearLayout(dstTy.getShape(), dstTy.getEncoding(), {});
+    LinearLayout srcLayout = toLinearLayout(srcTy);
+    LinearLayout dstLayout = toLinearLayout(dstTy);
 
     StringAttr kLane = str_attr("lane");