From 20c66a0c66340f44f04b6526e45bcc5d872d480a Mon Sep 17 00:00:00 2001 From: Giuseppe Rossini Date: Mon, 12 Jun 2023 16:56:08 +0000 Subject: [PATCH] [AMDGPU] Add basic support for gfx11xx This patch fixes a minor issue in AMDGPUToROCDL to add gfx11 support in MLIR Reviewed By: krzysz00 Differential Revision: https://reviews.llvm.org/D152450 --- mlir/lib/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.cpp | 2 +- mlir/test/Conversion/AMDGPUToROCDL/amdgpu-to-rocdl.mlir | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mlir/lib/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.cpp b/mlir/lib/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.cpp index 1769b1fa..b518665 100644 --- a/mlir/lib/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.cpp +++ b/mlir/lib/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.cpp @@ -213,7 +213,7 @@ struct RawBufferOpLowering : public ConvertOpToLLVMPattern { // none, 3 = either swizzles or testing against offset field) RDNA only // bits 30-31: Type (must be 0) uint32_t word3 = (7 << 12) | (4 << 15); - if (chipset.majorVersion == 10) { + if (chipset.majorVersion >= 10) { word3 |= (1 << 24); uint32_t oob = adaptor.getBoundsCheck() ? 3 : 2; word3 |= (oob << 28); diff --git a/mlir/test/Conversion/AMDGPUToROCDL/amdgpu-to-rocdl.mlir b/mlir/test/Conversion/AMDGPUToROCDL/amdgpu-to-rocdl.mlir index 1dbb70b..dda8a06 100644 --- a/mlir/test/Conversion/AMDGPUToROCDL/amdgpu-to-rocdl.mlir +++ b/mlir/test/Conversion/AMDGPUToROCDL/amdgpu-to-rocdl.mlir @@ -1,5 +1,6 @@ // RUN: mlir-opt %s -convert-amdgpu-to-rocdl=chipset=gfx908 | FileCheck %s // RUN: mlir-opt %s -convert-amdgpu-to-rocdl=chipset=gfx1030 | FileCheck %s --check-prefix=RDNA +// RUN: mlir-opt %s -convert-amdgpu-to-rocdl=chipset=gfx1100 | FileCheck %s --check-prefix=RDNA // CHECK-LABEL: func @gpu_gcn_raw_buffer_load_scalar_i32 func.func @gpu_gcn_raw_buffer_load_scalar_i32(%buf: memref) -> i32 { -- 2.7.4