Skip to content

Commit 8a7b0da

Browse files
committed
[mlir] Fully qualify MemoryEffects
The effect name is used by tablegen when generating the getEffects method of the SideEffectInterfaces. It is currently unqualified even though the class is contained within the mlir namespace, leading to compiler errors when using namespace mlir; isn't used before including the generated cpp file. This patch fixes that by simply fully qualifying the class name. Differential Revision: https://reviews.llvm.org/D107171
1 parent 9ca905b commit 8a7b0da

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

mlir/include/mlir/Interfaces/SideEffectInterfaces.td

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ class MemoryEffects<list<MemoryEffect> effects = []>
4949
// resource. An 'allocate' effect implies only allocation of the resource, and
5050
// not any visible mutation or dereference.
5151
class MemAlloc<Resource resource>
52-
: MemoryEffect<"MemoryEffects::Allocate", resource>;
52+
: MemoryEffect<"::mlir::MemoryEffects::Allocate", resource>;
5353
def MemAlloc : MemAlloc<DefaultResource>;
5454

5555
// The following effect indicates that the operation frees some resource that
5656
// has been allocated. A 'free' effect implies only de-allocation of the
5757
// resource, and not any visible allocation, mutation or dereference.
5858
class MemFree<Resource resource>
59-
: MemoryEffect<"MemoryEffects::Free", resource>;
59+
: MemoryEffect<"::mlir::MemoryEffects::Free", resource>;
6060
def MemFree : MemFree<DefaultResource>;
6161

6262
// The following effect indicates that the operation reads from some
6363
// resource. A 'read' effect implies only dereferencing of the resource, and
6464
// not any visible mutation.
6565
class MemRead<Resource resource>
66-
: MemoryEffect<"MemoryEffects::Read", resource>;
66+
: MemoryEffect<"::mlir::MemoryEffects::Read", resource>;
6767
def MemRead : MemRead<DefaultResource>;
6868

6969
// The following effect indicates that the operation writes to some
7070
// resource. A 'write' effect implies only mutating a resource, and not any
7171
// visible dereference or read.
7272
class MemWrite<Resource resource>
73-
: MemoryEffect<"MemoryEffects::Write", resource>;
73+
: MemoryEffect<"::mlir::MemoryEffects::Write", resource>;
7474
def MemWrite : MemWrite<DefaultResource>;
7575

7676
//===----------------------------------------------------------------------===//

mlir/test/mlir-tblgen/op-side-effects.td

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ def SideEffectOpB : TEST_Op<"side_effect_op_b",
2525

2626
// CHECK: void SideEffectOpA::getEffects
2727
// CHECK: for (::mlir::Value value : getODSOperands(0))
28-
// CHECK: effects.emplace_back(MemoryEffects::Read::get(), value, ::mlir::SideEffects::DefaultResource::get());
29-
// CHECK: effects.emplace_back(MemoryEffects::Read::get(), symbol(), ::mlir::SideEffects::DefaultResource::get());
30-
// CHECK: effects.emplace_back(MemoryEffects::Write::get(), flat_symbol(), ::mlir::SideEffects::DefaultResource::get());
28+
// CHECK: effects.emplace_back(::mlir::MemoryEffects::Read::get(), value, ::mlir::SideEffects::DefaultResource::get());
29+
// CHECK: effects.emplace_back(::mlir::MemoryEffects::Read::get(), symbol(), ::mlir::SideEffects::DefaultResource::get());
30+
// CHECK: effects.emplace_back(::mlir::MemoryEffects::Write::get(), flat_symbol(), ::mlir::SideEffects::DefaultResource::get());
3131
// CHECK: if (auto symbolRef = optional_symbolAttr())
32-
// CHECK: effects.emplace_back(MemoryEffects::Read::get(), symbolRef, ::mlir::SideEffects::DefaultResource::get());
32+
// CHECK: effects.emplace_back(::mlir::MemoryEffects::Read::get(), symbolRef, ::mlir::SideEffects::DefaultResource::get());
3333
// CHECK: for (::mlir::Value value : getODSResults(0))
34-
// CHECK: effects.emplace_back(MemoryEffects::Allocate::get(), value, CustomResource::get());
34+
// CHECK: effects.emplace_back(::mlir::MemoryEffects::Allocate::get(), value, CustomResource::get());
3535

3636
// CHECK: void SideEffectOpB::getEffects
37-
// CHECK: effects.emplace_back(MemoryEffects::Write::get(), CustomResource::get());
37+
// CHECK: effects.emplace_back(::mlir::MemoryEffects::Write::get(), CustomResource::get());

0 commit comments

Comments
 (0)