Skip to content

Commit 46c8353

Browse files
Wolfram70Wolfram70
committed
address comments
1 parent 06bdd62 commit 46c8353

File tree

10 files changed

+39
-39
lines changed

10 files changed

+39
-39
lines changed

‎mlir/include/mlir/Dialect/LLVMIR/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ mlir_tablegen(BasicPtxBuilderInterface.cpp.inc -gen-op-interface-defs)
5454
add_public_tablegen_target(MLIRBasicPtxBuilderInterfaceIncGen)
5555
add_dependencies(mlir-headers MLIRBasicPtxBuilderInterfaceIncGen)
5656

57-
set(LLVM_TARGET_DEFINITIONS NVVMTraits.td)
58-
mlir_tablegen(NVVMTraits.h.inc -gen-op-interface-decls)
59-
mlir_tablegen(NVVMTraits.cpp.inc -gen-op-interface-defs)
60-
add_public_tablegen_target(MLIRNVVMTraitsIncGen)
61-
add_dependencies(mlir-headers MLIRNVVMTraitsIncGen)
57+
set(LLVM_TARGET_DEFINITIONS NVVMRequiresSMTraits.td)
58+
mlir_tablegen(NVVMRequiresSMTraits.h.inc -gen-op-interface-decls)
59+
mlir_tablegen(NVVMRequiresSMTraits.cpp.inc -gen-op-interface-defs)
60+
add_public_tablegen_target(MLIRNVVMRequiresSMTraitsIncGen)
61+
add_dependencies(mlir-headers MLIRNVVMRequiresSMTraitsIncGen)
6262

6363
add_mlir_dialect(NVVMOps nvvm)
6464
add_mlir_doc(NVVMOps NVVMDialect Dialects/ -gen-dialect-doc -dialect=nvvm)

‎mlir/include/mlir/Dialect/LLVMIR/NVVMDialect.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "mlir/Dialect/GPU/IR/GPUDialect.h"
1919
#include "mlir/Dialect/LLVMIR/BasicPtxBuilderInterface.h"
2020
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
21-
#include "mlir/Dialect/LLVMIR/NVVMTraits.h"
21+
#include "mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.h"
2222
#include "mlir/IR/Dialect.h"
2323
#include "mlir/IR/OpDefinition.h"
2424
#include "mlir/Interfaces/InferIntRangeInterface.h"

‎mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
include "mlir/IR/EnumAttr.td"
1717
include "mlir/Dialect/GPU/IR/CompilationAttrInterfaces.td"
1818
include "mlir/Dialect/LLVMIR/LLVMOpBase.td"
19-
include "mlir/Dialect/LLVMIR/NVVMTraits.td"
19+
include "mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.td"
2020
include "mlir/Interfaces/SideEffectInterfaces.td"
2121
include "mlir/Dialect/LLVMIR/BasicPtxBuilderInterface.td"
2222
include "mlir/Interfaces/InferIntRangeInterface.td"
@@ -2584,7 +2584,7 @@ def NVVM_CpAsyncBulkSharedCTAToGlobalOp :
25842584
// NVVM Wgmma Ops
25852585
//===----------------------------------------------------------------------===//
25862586

2587-
def NVVM_WgmmaFenceAlignedOp : NVVM_Op<"wgmma.fence.aligned", [NVVMRequiresSM90a]> {
2587+
def NVVM_WgmmaFenceAlignedOp : NVVM_Op<"wgmma.fence.aligned", [NVVMRequiresSMa<90>]> {
25882588
let arguments = (ins);
25892589
let description = [{
25902590
Enforce an ordering of register accesses between warpgroup level matrix
@@ -2598,7 +2598,7 @@ def NVVM_WgmmaFenceAlignedOp : NVVM_Op<"wgmma.fence.aligned", [NVVMRequiresSM90a
25982598
}];
25992599
}
26002600

2601-
def NVVM_WgmmaGroupSyncAlignedOp : NVVM_Op<"wgmma.commit.group.sync.aligned", [NVVMRequiresSM90a]> {
2601+
def NVVM_WgmmaGroupSyncAlignedOp : NVVM_Op<"wgmma.commit.group.sync.aligned", [NVVMRequiresSMa<90>]> {
26022602
let assemblyFormat = "attr-dict";
26032603
let description = [{
26042604
Commits all prior uncommitted warpgroup level matrix multiplication operations.
@@ -2610,7 +2610,7 @@ def NVVM_WgmmaGroupSyncAlignedOp : NVVM_Op<"wgmma.commit.group.sync.aligned", [N
26102610
}];
26112611
}
26122612

2613-
def NVVM_WgmmaWaitGroupSyncOp : NVVM_Op<"wgmma.wait.group.sync.aligned", [NVVMRequiresSM90a]> {
2613+
def NVVM_WgmmaWaitGroupSyncOp : NVVM_Op<"wgmma.wait.group.sync.aligned", [NVVMRequiresSMa<90>]> {
26142614
let arguments = (ins I64Attr:$group);
26152615
let assemblyFormat = "attr-dict $group";
26162616
let description = [{

‎mlir/include/mlir/Dialect/LLVMIR/NVVMTraits.h‎ renamed to ‎mlir/include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===--- NVVMTraits.h - NVVM Traits -----------------------------*- C++ -*-===//
1+
//===--- NVVMRequiresSMTraits.h - NVVM Requires SM Traits -----*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef NVVM_DIALECT_NVVM_IR_NVVMTRAITS_H_
14-
#define NVVM_DIALECT_NVVM_IR_NVVMTRAITS_H_
13+
#ifndef NVVM_DIALECT_NVVM_IR_NVVMREQUIRESSMTRAITS_H_
14+
#define NVVM_DIALECT_NVVM_IR_NVVMREQUIRESSMTRAITS_H_
1515

1616
#include "mlir/IR/OpDefinition.h"
1717
#include "mlir/IR/StorageUniquerSupport.h"
@@ -70,7 +70,7 @@ struct NVVMCheckSMVersion {
7070
} // namespace NVVM
7171
} // namespace mlir
7272

73-
#include "mlir/Dialect/LLVMIR/NVVMTraits.h.inc"
73+
#include "mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.h.inc"
7474

7575
namespace mlir {
7676

@@ -93,4 +93,4 @@ class NVVMRequiresSM {
9393
};
9494
} // namespace OpTrait
9595
} // namespace mlir
96-
#endif // NVVM_DIALECT_NVVM_IR_NVVMTRAITS_H_
96+
#endif // NVVM_DIALECT_NVVM_IR_NVVMREQUIRESSMTRAITS_H_

‎mlir/include/mlir/Dialect/LLVMIR/NVVMTraits.td‎ renamed to ‎mlir/include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.td‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- NVVMTraits.td - NVVM Traits ------------------------*- tablegen -*-===//
1+
//===-- NVVMRequiresSMTraits.td - NVVM Requires SM Traits --*- tablegen -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef NVVM_TRAITS
14-
#define NVVM_TRAITS
13+
#ifndef NVVM_REQUIRES_SM_TRAITS
14+
#define NVVM_REQUIRES_SM_TRAITS
1515

1616
include "mlir/IR/OpBase.td"
1717
include "mlir/Dialect/LLVMIR/LLVMOpBase.td"
@@ -33,6 +33,6 @@ class NVVMRequiresSM<int minVersion, string isArchAccelerated = "false",
3333
!cast<string>(minVersion) # "," # isArchAccelerated # ","
3434
# exactMatch>;
3535

36-
def NVVMRequiresSM90a : NVVMRequiresSM<90, "true", "true">;
36+
class NVVMRequiresSMa<int version> : NVVMRequiresSM<version, "true", "true">;
3737

38-
#endif //NVVM_TRAITS
38+
#endif //NVVM_REQUIRES_SM_TRAITS

‎mlir/lib/Dialect/LLVMIR/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ add_mlir_dialect_library(MLIRLLVMDialect
4242
add_mlir_dialect_library(MLIRNVVMDialect
4343
IR/NVVMDialect.cpp
4444
IR/BasicPtxBuilderInterface.cpp
45-
IR/NVVMTraits.cpp
45+
IR/NVVMRequiresSMTraits.cpp
4646

4747
ADDITIONAL_HEADER_DIRS
4848
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
@@ -52,7 +52,7 @@ add_mlir_dialect_library(MLIRNVVMDialect
5252
MLIRNVVMOpsIncGen
5353
MLIRNVVMConversionsIncGen
5454
MLIRBasicPtxBuilderInterfaceIncGen
55-
MLIRNVVMTraitsIncGen
55+
MLIRNVVMRequiresSMTraitsIncGen
5656
intrinsics_gen
5757

5858
LINK_COMPONENTS

‎mlir/lib/Dialect/LLVMIR/IR/NVVMTraits.cpp‎ renamed to ‎mlir/lib/Dialect/LLVMIR/IR/NVVMRequiresSMTraits.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===--- NVVMTraits.h - NVVM Traits -----------------------------*- C++ -*-===//
1+
//===--- NVVMRequiresSMTraits.cpp - NVVM Requires SM Traits -----*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -10,6 +10,6 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#include "mlir/Dialect/LLVMIR/NVVMTraits.h"
13+
#include "mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.h"
1414

15-
#include "mlir/Dialect/LLVMIR/NVVMTraits.cpp.inc"
15+
#include "mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.cpp.inc"

‎mlir/test/lib/Dialect/Test/TestOps.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "mlir/Dialect/DLTI/DLTI.h"
1717
#include "mlir/Dialect/DLTI/Traits.h"
1818
#include "mlir/Dialect/Func/IR/FuncOps.h"
19-
#include "mlir/Dialect/LLVMIR/NVVMTraits.h"
19+
#include "mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.h"
2020
#include "mlir/Dialect/Linalg/IR/Linalg.h"
2121
#include "mlir/Dialect/Linalg/IR/LinalgInterfaces.h"
2222
#include "mlir/Dialect/Traits.h"

‎mlir/test/lib/Dialect/Test/TestOps.td‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ include "TestDialect.td"
1313
include "TestInterfaces.td"
1414
include "mlir/Dialect/DLTI/DLTIBase.td"
1515
include "mlir/Dialect/Linalg/IR/LinalgInterfaces.td"
16-
include "mlir/Dialect/LLVMIR/NVVMTraits.td"
16+
include "mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.td"
1717
include "mlir/IR/EnumAttr.td"
1818
include "mlir/Interfaces/FunctionInterfaces.td"
1919
include "mlir/IR/OpBase.td"
@@ -2818,7 +2818,7 @@ def TestNVVMRequiresAtleastSMArchCondOp :
28182818
}
28192819

28202820
def TestNVVMRequiresExactSMArchCondOp : TEST_Op<"nvvm_requires_sm_90a",
2821-
[NVVMRequiresSM90a]> {
2821+
[NVVMRequiresSMa<90>]> {
28222822
let arguments = (ins );
28232823
let assemblyFormat = "attr-dict";
28242824
}

‎utils/bazel/llvm-project-overlay/mlir/BUILD.bazel‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5774,18 +5774,18 @@ cc_library(
57745774
name = "NVVMDialect",
57755775
srcs = [
57765776
"lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp",
5777-
"lib/Dialect/LLVMIR/IR/NVVMTraits.cpp",
5777+
"lib/Dialect/LLVMIR/IR/NVVMRequiresSMTraits.cpp",
57785778
"lib/Dialect/LLVMIR/IR/NVVMDialect.cpp",
57795779
],
57805780
hdrs = [
57815781
"include/mlir/Dialect/LLVMIR/BasicPtxBuilderInterface.h",
5782-
"include/mlir/Dialect/LLVMIR/NVVMTraits.h",
5782+
"include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.h",
57835783
"include/mlir/Dialect/LLVMIR/NVVMDialect.h",
57845784
],
57855785
includes = ["include"],
57865786
deps = [
57875787
":BasicPtxBuilderIntGen",
5788-
":NVVMTraitsIntGen",
5788+
":NVVMRequiresSMTraitsIntGen",
57895789
":BytecodeOpInterface",
57905790
":ConvertToLLVMInterface",
57915791
":DialectUtils",
@@ -5859,8 +5859,8 @@ td_library(
58595859
)
58605860

58615861
td_library(
5862-
name = "NVVMTraitsIntTdFiles",
5863-
srcs = ["include/mlir/Dialect/LLVMIR/NVVMTraits.td"],
5862+
name = "NVVMRequiresSMTraitsIntTdFiles",
5863+
srcs = ["include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.td"],
58645864
includes = ["include"],
58655865
deps = [":OpBaseTdFiles"]
58665866
)
@@ -5871,7 +5871,7 @@ td_library(
58715871
includes = ["include"],
58725872
deps = [
58735873
":BasicPtxBuilderIntTdFiles",
5874-
":NVVMTraitsIntTdFiles",
5874+
":NVVMRequiresSMTraitsIntTdFiles",
58755875
":GPUOpsTdFiles",
58765876
":LLVMOpsTdFiles",
58775877
":OpBaseTdFiles",
@@ -5899,20 +5899,20 @@ gentbl_cc_library(
58995899
)
59005900

59015901
gentbl_cc_library(
5902-
name = "NVVMTraitsIntGen",
5902+
name = "NVVMRequiresSMTraitsIntGen",
59035903
tbl_outs = [
59045904
(
59055905
["-gen-op-interface-decls"],
5906-
"include/mlir/Dialect/LLVMIR/NVVMTraits.h.inc",
5906+
"include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.h.inc",
59075907
),
59085908
(
59095909
["-gen-op-interface-defs"],
5910-
"include/mlir/Dialect/LLVMIR/NVVMTraits.cpp.inc",
5910+
"include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.cpp.inc",
59115911
),
59125912
],
59135913
tblgen = ":mlir-tblgen",
5914-
td_file = "include/mlir/Dialect/LLVMIR/NVVMTraits.td",
5915-
deps = [":NVVMTraitsIntTdFiles"],
5914+
td_file = "include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.td",
5915+
deps = [":NVVMRequiresSMTraitsIntTdFiles"],
59165916
)
59175917

59185918
gentbl_cc_library(

0 commit comments

Comments
 (0)