[MLIR][AMDGPU] Replace isGfx940Series with an equality check for gfx942,

since gfx940 and gfx941 are no longer supported.

Signed-off-by: Mirza Halilcevic <[email protected]>

Author: mirza-halilcevic

mlir/include/mlir/Dialect/AMDGPU/Utils/Chipset.h

@@ -49,9 +49,6 @@ struct Chipset {
 #undef DEFINE_COMP_OPERATOR
 };
 
-inline bool isGfx940Series(const Chipset &chipset) {
-  return chipset.majorVersion == 9 && chipset.minorVersion == 4;
-}
 inline bool hasOcpFp8(const Chipset &chipset) {
   return (chipset.majorVersion == 9 && chipset.minorVersion >= 5) ||
          chipset.majorVersion >= 12;

mlir/lib/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.cpp

@@ -477,14 +477,14 @@ static void wmmaPushOutputOperand(ConversionPatternRewriter &rewriter,
 /// Return true if `type` is the E5M2 variant of an 8-bit float that is
 /// supported by the `_bf8` instructions on the given `chipset`.
 static bool typeIsExpectedBf8ForChipset(Chipset chipset, Type type) {
-  return (isGfx940Series(chipset) && isa<Float8E5M2FNUZType>(type)) ||
+  return (chipset == kGfx942 && isa<Float8E5M2FNUZType>(type)) ||
          (hasOcpFp8(chipset) && isa<Float8E5M2Type>(type));
 }
 
 /// Return true if `type` is the E4M3FN variant of an 8-bit float that is
 /// supported by the `_fp8` instructions on the given `chipset`.
 static bool typeIsExpectedFp8ForChipset(Chipset chipset, Type type) {
-  return (isGfx940Series(chipset) && isa<Float8E4M3FNUZType>(type)) ||
+  return (chipset == kGfx942 && isa<Float8E4M3FNUZType>(type)) ||
          (hasOcpFp8(chipset) && isa<Float8E4M3FNType>(type));
 }
 
@@ -793,7 +793,7 @@ LogicalResult ExtPackedFp8OpLowering::matchAndRewrite(
     ExtPackedFp8Op op, ExtPackedFp8OpAdaptor adaptor,
     ConversionPatternRewriter &rewriter) const {
   Location loc = op.getLoc();
-  if (!(isGfx940Series(chipset) || hasOcpFp8(chipset)))
+  if (!(chipset == kGfx942 || hasOcpFp8(chipset)))
     return rewriter.notifyMatchFailure(
         loc, "Fp8 conversion instructions are not available on target "
              "architecture and their emulation is not implemented");
@@ -837,7 +837,7 @@ LogicalResult PackedTrunc2xFp8OpLowering::matchAndRewrite(
     PackedTrunc2xFp8Op op, PackedTrunc2xFp8OpAdaptor adaptor,
     ConversionPatternRewriter &rewriter) const {
   Location loc = op.getLoc();
-  if (!(isGfx940Series(chipset) || hasOcpFp8(chipset)))
+  if (!(chipset == kGfx942 || hasOcpFp8(chipset)))
     return rewriter.notifyMatchFailure(
         loc, "Fp8 conversion instructions are not available on target "
              "architecture and their emulation is not implemented");
@@ -874,7 +874,7 @@ LogicalResult PackedStochRoundFp8OpLowering::matchAndRewrite(
     PackedStochRoundFp8Op op, PackedStochRoundFp8OpAdaptor adaptor,
     ConversionPatternRewriter &rewriter) const {
   Location loc = op.getLoc();
-  if (!(isGfx940Series(chipset) || hasOcpFp8(chipset)))
+  if (!(chipset == kGfx942 || hasOcpFp8(chipset)))
     return rewriter.notifyMatchFailure(
         loc, "Fp8 conversion instructions are not available on target "
              "architecture and their emulation is not implemented");

mlir/lib/Conversion/ArithToAMDGPU/ArithToAMDGPU.cpp

@@ -30,6 +30,9 @@ using namespace mlir;
 using namespace mlir::amdgpu;
 
 namespace {
+// Define commonly used chipsets versions for convenience.
+constexpr Chipset kGfx942 = Chipset(9, 4, 2);
+
 struct ArithToAMDGPUConversionPass final
     : impl::ArithToAMDGPUConversionPassBase<ArithToAMDGPUConversionPass> {
   using impl::ArithToAMDGPUConversionPassBase<
@@ -73,7 +76,7 @@ struct TruncfToFloat16RewritePattern final
 } // end namespace
 
 static LogicalResult isSupportedF8(Type elementType, Chipset chipset) {
-  if (isGfx940Series(chipset))
+  if (chipset == kGfx942)
     return success(isa<Float8E4M3FNUZType, Float8E5M2FNUZType>(elementType));
   if (hasOcpFp8(chipset))
     return success(isa<Float8E4M3FNType, Float8E5M2Type>(elementType));
@@ -397,7 +400,7 @@ void ArithToAMDGPUConversionPass::runOnOperation() {
   }
 
   bool convertFP8Arithmetic =
-      isGfx940Series(*maybeChipset) || hasOcpFp8(*maybeChipset);
+      *maybeChipset == kGfx942 || hasOcpFp8(*maybeChipset);
   arith::populateArithToAMDGPUConversionPatterns(
       patterns, convertFP8Arithmetic, saturateFP8Truncf, allowPackedF16Rtz,
       *maybeChipset);