Fix build and test failures from 3e30ae6

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

Author: whitneywhtsang

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

@@ -135,21 +135,6 @@ SmallVector<unsigned> DpasEncodingAttr::getShapeC() const {
   return resShape;
 }
 
-SmallVector<unsigned> DpasEncodingAttr::getDefaultOrder() const {
-  auto rank = getWarpsPerCTA().size();
-  return getMatrixOrder(rank, /*rowMajor*/ true);
-}
-
-SmallVector<unsigned> DpasEncodingAttr::getDefaultThreadOrder() const {
-  auto rank = getWarpsPerCTA().size();
-  return getMatrixOrder(rank, /*rowMajor*/ true);
-}
-
-SmallVector<unsigned> DpasEncodingAttr::getDefaultWarpOrder() const {
-  auto rank = getWarpsPerCTA().size();
-  return getMatrixOrder(rank, /*rowMajor*/ true);
-}
-
 SmallVector<unsigned> DpasEncodingAttr::getRepOrder() const {
   auto rank = getWarpsPerCTA().size();
   return getMatrixOrder(rank, /*rowMajor*/ true);
@@ -459,18 +444,6 @@ LinearLayout WarpEncodingAttr::toLinearLayout(ArrayRef<int64_t> shape) const {
   llvm::report_fatal_error("NYI. WarpEncodingAttr::toLinearLayout");
 }
 
-SmallVector<unsigned> WarpEncodingAttr::getDefaultOrder() const {
-  llvm::report_fatal_error("NYI. WarpEncodingAttr::getDefaultOrder");
-}
-
-SmallVector<unsigned> WarpEncodingAttr::getDefaultThreadOrder() const {
-  llvm::report_fatal_error("NYI. WarpEncodingAttr::getDefaultThreadOrder");
-}
-
-SmallVector<unsigned> WarpEncodingAttr::getDefaultWarpOrder() const {
-  llvm::report_fatal_error("NYI. WarpEncodingAttr::getDefaultWarpOrder");
-}
-
 SmallVector<unsigned> WarpEncodingAttr::getCTAsPerCGA() const {
   llvm::report_fatal_error("NYI. WarpEncodingAttr::getCTAsPerCGA");
 }

third_party/intel/lib/TritonIntelGPUToLLVM/LoadStoreOpToLLVM.cpp

@@ -556,7 +556,8 @@ struct LoadOpToBlockIOConversion
     SmallVector<int64_t> numReps =
         dpasLayout.getDPASRepetitions(tensorShape, opIdx);
     const SmallVector<unsigned> warpsPerCTA = dpasLayout.getWarpsPerCTA();
-    SmallVector<unsigned> dpasWarpsOrder = triton::gpu::getOrder(tensorType);
+    SmallVector<unsigned> dpasWarpsOrder =
+        getMatrixOrder(warpsPerCTA.size(), /*rowMajor*/ true);
     unsigned threadsPerWarp =
         product<unsigned>(getThreadsPerWarp(dpasLayout, tensorShape));
 
@@ -1047,7 +1048,7 @@ struct LoadOpConversion
         dpasLayout.getDPASRepetitions(tensorShape, opIdx);
     const SmallVector<unsigned> warpsPerCTA = dpasLayout.getWarpsPerCTA();
     SmallVector<unsigned> dpasWarpsOrder =
-        triton::gpu::getWarpOrder(tensorType);
+        getMatrixOrder(warpsPerCTA.size(), /*rowMajor*/ true);
     unsigned threadsPerWarp =
         product<unsigned>(getThreadsPerWarp(dpasLayout, tensorShape));
 
@@ -1680,7 +1681,8 @@ struct StoreOpConversion
     const SmallVector<unsigned> warpsPerCTA = dpasLayout.getWarpsPerCTA();
     SmallVector<int64_t> numReps =
         dpasLayout.getDPASRepetitions(tensorShape, 2);
-    SmallVector<unsigned> dpasWarpsOrder = triton::gpu::getOrder(tensorType);
+    SmallVector<unsigned> dpasWarpsOrder =
+        getMatrixOrder(warpsPerCTA.size(), /*rowMajor*/ true);
     unsigned threadsPerWarp =
         product<unsigned>(getThreadsPerWarp(dpasLayout, tensorShape));