Skip to content

Commit 226fb65

Browse files
committed
Added new AMDGPU gfx950 features in Rocdl dialect.
New MFMA variants. ds.read.r*.* and global.load.lds
1 parent 47552dd commit 226fb65

File tree

5 files changed

+9
-16
lines changed

5 files changed

+9
-16
lines changed

third_party/amd/lib/TritonAMDGPUToLLVM/BufferOpsEmitter.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#include "PatternTritonGPUOpToLLVM.h"
22
#include "TargetInfo.h"
3-
// clang-format off
4-
#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
53
#include "Utility.h"
6-
// clang-format on
74
#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
5+
#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
86
#include "mlir/IR/PatternMatch.h"
97
#include "triton/Conversion/TritonGPUToLLVM/TypeConverter.h"
108
#include "triton/Dialect/Triton/IR/Dialect.h"

third_party/nvidia/lib/TritonNVIDIAGPUToLLVM/ConvertLayoutOpToLLVM.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#include "PatternTritonGPUOpToLLVM.h"
22
#include "TargetInfo.h"
3-
// clang-format off
4-
#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
53
#include "Utility.h"
6-
// clang-format on
74
#include "mlir/Conversion/LLVMCommon/Pattern.h"
5+
#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
86
#include "mlir/IR/PatternMatch.h"
97
#include "triton/Conversion/TritonGPUToLLVM/PatternTritonGPUOpToLLVM.h"
108
#include "triton/Conversion/TritonGPUToLLVM/Utility.h"

third_party/nvidia/lib/TritonNVIDIAGPUToLLVM/DotOpToLLVM/MMAv5.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ enum class mxfpKind { mxf8f6f4 = 0, mxf4 = 1, mxf4nvf4 = 2 };
6161
inline mxfpKind getMXFPKind(ScaleDotElemType typeA, ScaleDotElemType typeB,
6262
Type scaleAType, Type scaleBType) {
6363
if (typeA == ScaleDotElemType::E2M1 && typeB == ScaleDotElemType::E2M1) {
64-
if (scaleAType.isFloat8E4M3FN() && scaleBType.isFloat8E4M3FN()) {
64+
if (llvm::isa<Float8E4M3FNType>(scaleAType) &&
65+
llvm::isa<Float8E4M3FNType>(scaleBType)) {
6566
return mxfpKind::mxf4nvf4;
6667
}
6768
return mxfpKind::mxf4;
@@ -102,9 +103,9 @@ static Value createInstDescriptor(ConversionPatternRewriter &rewriter,
102103
return 1;
103104
if (type.isF32())
104105
return 2;
105-
if (type.isFloat8E4M3FN())
106+
if (llvm::isa<Float8E4M3FNType>(type))
106107
return 0;
107-
if (type.isFloat8E5M2())
108+
if (llvm::isa<Float8E5M2Type>(type))
108109
return 1;
109110
llvm_unreachable("Unsupported type.");
110111
};
@@ -227,7 +228,7 @@ static void createGen5MMA(ConversionPatternRewriter &rewriter, Location loc,
227228
opcode += "f16";
228229
else if (srcElementTy.isF32())
229230
opcode += "tf32";
230-
else if (srcElementTy.isFloat8E4M3FN() || srcElementTy.isFloat8E5M2())
231+
else if (llvm::isa<Float8E4M3FNType, Float8E5M2Type>(srcElementTy))
231232
opcode += "f8f6f4";
232233
else
233234
assert(0 && "Unsupported type.");

third_party/nvidia/lib/TritonNVIDIAGPUToLLVM/TargetInfo.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
#include "TargetInfo.h"
22
#include "Dialect/NVGPU/IR/Dialect.h"
33
#include "TritonNVIDIAGPUToLLVM/PTXAsmFormat.h"
4-
// clang-format off
5-
#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
64
#include "Utility.h"
7-
// clang-format on
85
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
96
#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
7+
#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
108
#include "llvm/Support/MathExtras.h"
119

1210
using namespace mlir;

third_party/nvidia/lib/TritonNVIDIAGPUToLLVM/Utility.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
// clang-format off
2-
#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
31
#include "Utility.h"
4-
// clang-format on
52
#include "Dialect/NVGPU/IR/Dialect.h"
3+
#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
64
#include "triton/Conversion/TritonGPUToLLVM/TypeConverter.h"
75

86
namespace mlir {

0 commit comments

Comments
 (0)