Skip to content

Commit 2f286b5

Browse files
authored
Revert "[NFI]: Prepare code for FMA loop generation feature (#5160)" (#5182)
This reverts commit daae522.
1 parent bef7455 commit 2f286b5

File tree

5 files changed

+7
-254
lines changed

5 files changed

+7
-254
lines changed

third_party/intel/lib/TritonIntelGPUToLLVM/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ add_triton_library(TritonIntelGPUToLLVM
55
ControlFlowOpToLLVM.cpp
66
ConvertLayoutOpToLLVM.cpp
77
DotOpToLLVM/DPAS.cpp
8-
DotOpToLLVM/FMA.cpp
9-
DotOpToLLVM/FMADotUtility.cpp
108
DotOpToLLVM.cpp
119
ElementwiseOpToLLVM.cpp
1210
Fp4ToFpOpToLLVM.cpp

third_party/intel/lib/TritonIntelGPUToLLVM/DotOpToLLVM.cpp

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,11 @@ using namespace mlir::triton;
66
using ::mlir::triton::gpu::getShapePerCTA;
77
using ::mlir::triton::gpu::intel::DpasEncodingAttr;
88

9-
namespace mlir::triton::gpu::intel {
10-
11-
LogicalResult convertFMADot(DotOp op, DotOp::Adaptor adaptor,
12-
const LLVMTypeConverter *typeConverter,
13-
ConversionPatternRewriter &rewriter);
14-
9+
namespace fma_details {
1510
LogicalResult convertDPAS(triton::DotOp op, triton::DotOp::Adaptor adaptor,
1611
TritonIntelGPUToLLVMTypeConverter *typeConverter,
1712
ConversionPatternRewriter &rewriter);
18-
19-
} // namespace mlir::triton::gpu::intel
13+
} // namespace fma_details
2014

2115
namespace {
2216
struct DotOpConversion : public ConvertTritonGPUOpToLLVMPattern<triton::DotOp> {
@@ -39,14 +33,13 @@ struct DotOpConversion : public ConvertTritonGPUOpToLLVMPattern<triton::DotOp> {
3933

4034
if (!isOuter && isa<DpasEncodingAttr>(
4135
cast<RankedTensorType>(D.getType()).getEncoding())) {
42-
return triton::gpu::intel::convertDPAS(op, adaptor, getTypeConverter(),
43-
rewriter);
36+
return fma_details::convertDPAS(op, adaptor, getTypeConverter(),
37+
rewriter);
4438
}
4539

4640
if (isa<BlockedEncodingAttr>(
4741
cast<RankedTensorType>(D.getType()).getEncoding()))
48-
return triton::gpu::intel::convertFMADot(op, adaptor, getTypeConverter(),
49-
rewriter);
42+
return convertFMADot(op, adaptor, getTypeConverter(), rewriter);
5043

5144
llvm::report_fatal_error(
5245
"Unsupported DotOp found when converting TritonGPU to LLVM.");

third_party/intel/lib/TritonIntelGPUToLLVM/DotOpToLLVM/DPAS.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,7 @@ class DotOpDPASConversionHelper {
406406

407407
} // namespace
408408

409-
namespace mlir::triton::gpu::intel {
410-
409+
namespace fma_details {
411410
LogicalResult convertDPAS(triton::DotOp op, triton::DotOp::Adaptor adaptor,
412411
TritonIntelGPUToLLVMTypeConverter *typeConverter,
413412
ConversionPatternRewriter &rewriter) {
@@ -442,5 +441,4 @@ LogicalResult convertDPAS(triton::DotOp op, triton::DotOp::Adaptor adaptor,
442441

443442
return helper.convertDot(op, adaptor);
444443
}
445-
446-
} // namespace mlir::triton::gpu::intel
444+
} // namespace fma_details

third_party/intel/lib/TritonIntelGPUToLLVM/DotOpToLLVM/FMA.cpp

Lines changed: 0 additions & 66 deletions
This file was deleted.

third_party/intel/lib/TritonIntelGPUToLLVM/DotOpToLLVM/FMADotUtility.cpp

Lines changed: 0 additions & 170 deletions
This file was deleted.

0 commit comments

Comments
 (0)