Skip to content

Commit 1c237ad

Browse files
FMarnoFMarno
committed
amend! fixes after rebase
fixup! amend! refine while attrs applied to which ops
1 parent 54d16fe commit 1c237ad

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎mlir/lib/Conversion/GPUToLLVMSPV/GPUToLLVMSPV.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static LLVM::LLVMFuncOp lookupOrCreateSPIRVFn(Operation *symbolTable,
6262
auto memAttr = b.getAttr<LLVM::MemoryEffectsAttr>(
6363
/*other=*/noModRef,
6464
/*argMem=*/noModRef, /*inaccessibleMem=*/noModRef);
65-
func.setMemoryAttr(memAttr);
65+
func.setMemoryEffectsAttr(memAttr);
6666
}
6767

6868
func.setConvergent(isConvergent);

‎mlir/test/Conversion/GPUToLLVMSPV/gpu-to-llvm-spv.mlir

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,35 @@
66
gpu.module @builtins {
77
// CHECK-64: llvm.func spir_funccc @_Z14get_num_groupsj(i32) -> i64 attributes {
88
// CHECK-32: llvm.func spir_funccc @_Z14get_num_groupsj(i32) -> i32 attributes {
9-
// CHECK-SAME-DAG: memory = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
9+
// CHECK-SAME-DAG: memory_effects = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
1010
// CHECK-SAME-DAG: no_unwind
1111
// CHECK-SAME-DAG: will_return
1212
// CHECK-NOT: convergent
1313
// CHECK-SAME: }
1414
// CHECK-64: llvm.func spir_funccc @_Z12get_local_idj(i32) -> i64 attributes {
1515
// CHECK-32: llvm.func spir_funccc @_Z12get_local_idj(i32) -> i32 attributes {
16-
// CHECK-SAME-DAG: memory = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
16+
// CHECK-SAME-DAG: memory_effects = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
1717
// CHECK-SAME-DAG: no_unwind
1818
// CHECK-SAME-DAG: will_return
1919
// CHECK-NOT: convergent
2020
// CHECK-SAME: }
2121
// CHECK-64: llvm.func spir_funccc @_Z14get_local_sizej(i32) -> i64 attributes {
2222
// CHECK-32: llvm.func spir_funccc @_Z14get_local_sizej(i32) -> i32 attributes {
23-
// CHECK-SAME-DAG: memory = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
23+
// CHECK-SAME-DAG: memory_effects = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
2424
// CHECK-SAME-DAG: no_unwind
2525
// CHECK-SAME-DAG: will_return
2626
// CHECK-NOT: convergent
2727
// CHECK-SAME: }
2828
// CHECK-64: llvm.func spir_funccc @_Z13get_global_idj(i32) -> i64 attributes {
2929
// CHECK-32: llvm.func spir_funccc @_Z13get_global_idj(i32) -> i32 attributes {
30-
// CHECK-SAME-DAG: memory = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
30+
// CHECK-SAME-DAG: memory_effects = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
3131
// CHECK-SAME-DAG: no_unwind
3232
// CHECK-SAME-DAG: will_return
3333
// CHECK-NOT: convergent
3434
// CHECK-SAME: }
3535
// CHECK-64: llvm.func spir_funccc @_Z12get_group_idj(i32) -> i64 attributes {
3636
// CHECK-32: llvm.func spir_funccc @_Z12get_group_idj(i32) -> i32 attributes {
37-
// CHECK-SAME-DAG: memory = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
37+
// CHECK-SAME-DAG: memory_effects = #llvm.memory_effects<other = none, argMem = none, inaccessibleMem = none>
3838
// CHECK-SAME-DAG: no_unwind
3939
// CHECK-SAME-DAG: will_return
4040
// CHECK-NOT: convergent
@@ -133,7 +133,7 @@ gpu.module @barriers {
133133
// CHECK-SAME-DAG: no_unwind
134134
// CHECK-SAME-DAG: convergent
135135
// CHECK-SAME-DAG: will_return
136-
// CHECK-NOT: memory = #llvm.memory_effects
136+
// CHECK-NOT: memory_effects = #llvm.memory_effects
137137
// CHECK-SAME: }
138138

139139
// CHECK-LABEL: gpu_barrier
@@ -154,25 +154,25 @@ gpu.module @shuffles {
154154
// CHECK-SAME-DAG: no_unwind
155155
// CHECK-SAME-DAG: convergent
156156
// CHECK-SAME-DAG: will_return
157-
// CHECK-NOT: memory = #llvm.memory_effects
157+
// CHECK-NOT: memory_effects = #llvm.memory_effects
158158
// CHECK-SAME: }
159159
// CHECK: llvm.func spir_funccc @_Z20sub_group_shuffle_upfj(f32, i32) -> f32 attributes {
160160
// CHECK-SAME-DAG: no_unwind
161161
// CHECK-SAME-DAG: convergent
162162
// CHECK-SAME-DAG: will_return
163-
// CHECK-NOT: memory = #llvm.memory_effects
163+
// CHECK-NOT: memory_effects = #llvm.memory_effects
164164
// CHECK-SAME: }
165165
// CHECK: llvm.func spir_funccc @_Z21sub_group_shuffle_xorlj(i64, i32) -> i64 attributes {
166166
// CHECK-SAME-DAG: no_unwind
167167
// CHECK-SAME-DAG: convergent
168168
// CHECK-SAME-DAG: will_return
169-
// CHECK-NOT: memory = #llvm.memory_effects
169+
// CHECK-NOT: memory_effects = #llvm.memory_effects
170170
// CHECK-SAME: }
171171
// CHECK: llvm.func spir_funccc @_Z17sub_group_shuffleij(i32, i32) -> i32 attributes {
172172
// CHECK-SAME-DAG: no_unwind
173173
// CHECK-SAME-DAG: convergent
174174
// CHECK-SAME-DAG: will_return
175-
// CHECK-NOT: memory = #llvm.memory_effects
175+
// CHECK-NOT: memory_effects = #llvm.memory_effects
176176
// CHECK-SAME: }
177177

178178
// CHECK-LABEL: gpu_shuffles
@@ -209,25 +209,25 @@ gpu.module @shuffles attributes {
209209
// CHECK-SAME-DAG: no_unwind
210210
// CHECK-SAME-DAG: convergent
211211
// CHECK-SAME-DAG: will_return
212-
// CHECK-NOT: memory = #llvm.memory_effects
212+
// CHECK-NOT: memory_effects = #llvm.memory_effects
213213
// CHECK-SAME: }
214214
// CHECK: llvm.func spir_funccc @_Z20sub_group_shuffle_upfj(f32, i32) -> f32 attributes {
215215
// CHECK-SAME-DAG: no_unwind
216216
// CHECK-SAME-DAG: convergent
217217
// CHECK-SAME-DAG: will_return
218-
// CHECK-NOT: memory = #llvm.memory_effects
218+
// CHECK-NOT: memory_effects = #llvm.memory_effects
219219
// CHECK-SAME: }
220220
// CHECK: llvm.func spir_funccc @_Z21sub_group_shuffle_xorlj(i64, i32) -> i64 attributes {
221221
// CHECK-SAME-DAG: no_unwind
222222
// CHECK-SAME-DAG: convergent
223223
// CHECK-SAME-DAG: will_return
224-
// CHECK-NOT: memory = #llvm.memory_effects
224+
// CHECK-NOT: memory_effects = #llvm.memory_effects
225225
// CHECK-SAME: }
226226
// CHECK: llvm.func spir_funccc @_Z17sub_group_shuffleij(i32, i32) -> i32 attributes {
227227
// CHECK-SAME-DAG: no_unwind
228228
// CHECK-SAME-DAG: convergent
229229
// CHECK-SAME-DAG: will_return
230-
// CHECK-NOT: memory = #llvm.memory_effects
230+
// CHECK-NOT: memory_effects = #llvm.memory_effects
231231
// CHECK-SAME: }
232232

233233
// CHECK-LABEL: gpu_shuffles

0 commit comments

Comments
 (0)