Skip to content

Commit 6931515

Browse files
author
Simon Camphausen
committed
Rename lvalue_load to load
1 parent 9a75b89 commit 6931515

File tree

17 files changed

+51
-52
lines changed

17 files changed

+51
-52
lines changed

‎mlir/include/mlir/Dialect/EmitC/IR/EmitC.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ def EmitC_LogicalOrOp : EmitC_BinaryOp<"logical_or", [CExpression]> {
836836
let assemblyFormat = "operands attr-dict `:` type(operands)";
837837
}
838838

839-
def EmitC_LValueLoadOp : EmitC_Op<"lvalue_load", [
839+
def EmitC_LoadOp : EmitC_Op<"load", [
840840
TypesMatchWith<"result type matches value type of 'operand'",
841841
"operand", "result",
842842
"::llvm::cast<LValueType>($_self).getValueType()">

‎mlir/include/mlir/Dialect/EmitC/IR/EmitCTypes.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class EmitC_LValueOf<list<Type> allowedTypes> :
180180
ContainerType<
181181
AnyTypeOf<allowedTypes>,
182182
CPred<"::llvm::isa<::mlir::emitc::LValueType>($_self)">,
183-
"::llvm::cast<::mlir::emitc::LValueType>($_self).getValue()",
183+
"::llvm::cast<::mlir::emitc::LValueType>($_self).getValueType()",
184184
"emitc.lvalue",
185185
"::mlir::emitc::LValueType"
186186
>;

‎mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ struct ConvertLoad final : public OpConversionPattern<memref::LoadOp> {
137137
auto subscript = rewriter.create<emitc::SubscriptOp>(
138138
op.getLoc(), arrayValue, operands.getIndices());
139139

140-
rewriter.replaceOpWithNewOp<emitc::LValueLoadOp>(op, resultTy, subscript);
140+
rewriter.replaceOpWithNewOp<emitc::LoadOp>(op, resultTy, subscript);
141141
return success();
142142
}
143143
};

‎mlir/lib/Conversion/SCFToEmitC/SCFToEmitC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ SmallVector<Value> loadValues(const SmallVector<Value> &variables,
8585
PatternRewriter &rewriter, Location loc) {
8686
return llvm::map_to_vector<>(variables, [&](Value var) {
8787
Type type = cast<emitc::LValueType>(var.getType()).getValueType();
88-
return rewriter.create<emitc::LValueLoadOp>(loc, type, var).getResult();
88+
return rewriter.create<emitc::LoadOp>(loc, type, var).getResult();
8989
});
9090
}
9191

‎mlir/lib/Target/Cpp/TranslateToCpp.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -384,12 +384,11 @@ static LogicalResult printOperation(CppEmitter &emitter,
384384
return emitter.emitOperand(assignOp.getValue());
385385
}
386386

387-
static LogicalResult printOperation(CppEmitter &emitter,
388-
emitc::LValueLoadOp lValueLoadOp) {
389-
if (failed(emitter.emitAssignPrefix(*lValueLoadOp)))
387+
static LogicalResult printOperation(CppEmitter &emitter, emitc::LoadOp loadOp) {
388+
if (failed(emitter.emitAssignPrefix(*loadOp)))
390389
return failure();
391390

392-
return emitter.emitOperand(lValueLoadOp.getOperand());
391+
return emitter.emitOperand(loadOp.getOperand());
393392
}
394393

395394
static LogicalResult printBinaryOperation(CppEmitter &emitter,
@@ -1551,11 +1550,11 @@ LogicalResult CppEmitter::emitOperation(Operation &op, bool trailingSemicolon) {
15511550
emitc::CallOpaqueOp, emitc::CastOp, emitc::CmpOp,
15521551
emitc::ConditionalOp, emitc::ConstantOp, emitc::DeclareFuncOp,
15531552
emitc::DivOp, emitc::ExpressionOp, emitc::ForOp, emitc::FuncOp,
1554-
emitc::GlobalOp, emitc::IfOp, emitc::IncludeOp,
1555-
emitc::LValueLoadOp, emitc::LogicalAndOp, emitc::LogicalNotOp,
1556-
emitc::LogicalOrOp, emitc::MulOp, emitc::RemOp, emitc::ReturnOp,
1557-
emitc::SubOp, emitc::SwitchOp, emitc::UnaryMinusOp,
1558-
emitc::UnaryPlusOp, emitc::VariableOp, emitc::VerbatimOp>(
1553+
emitc::GlobalOp, emitc::IfOp, emitc::IncludeOp, emitc::LoadOp,
1554+
emitc::LogicalAndOp, emitc::LogicalNotOp, emitc::LogicalOrOp,
1555+
emitc::MulOp, emitc::RemOp, emitc::ReturnOp, emitc::SubOp,
1556+
emitc::SwitchOp, emitc::UnaryMinusOp, emitc::UnaryPlusOp,
1557+
emitc::VariableOp, emitc::VerbatimOp>(
15591558
[&](auto op) { return printOperation(*this, op); })
15601559
// Func ops.
15611560
.Case<func::CallOp, func::FuncOp, func::ReturnOp>(

‎mlir/test/Conversion/MemRefToEmitC/memref-to-emitc.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func.func @memref_load(%i: index, %j: index) -> f32 {
2121
%0 = memref.alloca() : memref<4x8xf32>
2222

2323
// CHECK-NEXT: %[[SUBSCRIPT:.*]] = emitc.subscript %[[ALLOCA]][%[[i]], %[[j]]] : (!emitc.array<4x8xf32>, index, index) -> !emitc.lvalue<f32>
24-
// CHECK-NEXT: %[[LOAD:.*]] = emitc.lvalue_load %[[SUBSCRIPT]] : <f32>
24+
// CHECK-NEXT: %[[LOAD:.*]] = emitc.load %[[SUBSCRIPT]] : <f32>
2525
%1 = memref.load %0[%i, %j] : memref<4x8xf32>
2626
// CHECK-NEXT: return %[[LOAD]] : f32
2727
return %1 : f32

‎mlir/test/Conversion/SCFToEmitC/for.mlir

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ func.func @for_yield(%arg0 : index, %arg1 : index, %arg2 : index) -> (f32, f32)
5252
// CHECK-NEXT: emitc.assign %[[VAL_3]] : f32 to %[[VAL_5]] : <f32>
5353
// CHECK-NEXT: emitc.assign %[[VAL_4]] : f32 to %[[VAL_6]] : <f32>
5454
// CHECK-NEXT: emitc.for %[[VAL_7:.*]] = %[[VAL_0]] to %[[VAL_1]] step %[[VAL_2]] {
55-
// CHECK-NEXT: %[[VAL_8:.*]] = emitc.lvalue_load %[[VAL_5]] : <f32>
56-
// CHECK-NEXT: %[[VAL_9:.*]] = emitc.lvalue_load %[[VAL_6]] : <f32>
55+
// CHECK-NEXT: %[[VAL_8:.*]] = emitc.load %[[VAL_5]] : <f32>
56+
// CHECK-NEXT: %[[VAL_9:.*]] = emitc.load %[[VAL_6]] : <f32>
5757
// CHECK-NEXT: %[[VAL_10:.*]] = arith.addf %[[VAL_8]], %[[VAL_9]] : f32
5858
// CHECK-NEXT: emitc.assign %[[VAL_10]] : f32 to %[[VAL_5]] : <f32>
5959
// CHECK-NEXT: emitc.assign %[[VAL_10]] : f32 to %[[VAL_6]] : <f32>
6060
// CHECK-NEXT: }
61-
// CHECK-NEXT: %[[VAL_11:.*]] = emitc.lvalue_load %[[VAL_5]] : <f32>
62-
// CHECK-NEXT: %[[VAL_12:.*]] = emitc.lvalue_load %[[VAL_6]] : <f32>
61+
// CHECK-NEXT: %[[VAL_11:.*]] = emitc.load %[[VAL_5]] : <f32>
62+
// CHECK-NEXT: %[[VAL_12:.*]] = emitc.load %[[VAL_6]] : <f32>
6363
// CHECK-NEXT: return %[[VAL_11]], %[[VAL_12]] : f32, f32
6464
// CHECK-NEXT: }
6565

@@ -80,17 +80,17 @@ func.func @nested_for_yield(%arg0 : index, %arg1 : index, %arg2 : index) -> f32
8080
// CHECK-NEXT: %[[VAL_4:.*]] = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.lvalue<f32>
8181
// CHECK-NEXT: emitc.assign %[[VAL_3]] : f32 to %[[VAL_4]] : <f32>
8282
// CHECK-NEXT: emitc.for %[[VAL_5:.*]] = %[[VAL_0]] to %[[VAL_1]] step %[[VAL_2]] {
83-
// CHECK-NEXT: %[[VAL_6:.*]] = emitc.lvalue_load %[[VAL_4]] : <f32>
83+
// CHECK-NEXT: %[[VAL_6:.*]] = emitc.load %[[VAL_4]] : <f32>
8484
// CHECK-NEXT: %[[VAL_7:.*]] = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.lvalue<f32>
8585
// CHECK-NEXT: emitc.assign %[[VAL_6]] : f32 to %[[VAL_7]] : <f32>
8686
// CHECK-NEXT: emitc.for %[[VAL_8:.*]] = %[[VAL_0]] to %[[VAL_1]] step %[[VAL_2]] {
87-
// CHECK-NEXT: %[[VAL_9:.*]] = emitc.lvalue_load %[[VAL_7]] : <f32>
87+
// CHECK-NEXT: %[[VAL_9:.*]] = emitc.load %[[VAL_7]] : <f32>
8888
// CHECK-NEXT: %[[VAL_10:.*]] = arith.addf %[[VAL_9]], %[[VAL_9]] : f32
8989
// CHECK-NEXT: emitc.assign %[[VAL_10]] : f32 to %[[VAL_7]] : <f32>
9090
// CHECK-NEXT: }
91-
// CHECK-NEXT: %[[VAL_11:.*]] = emitc.lvalue_load %[[VAL_7]] : <f32>
91+
// CHECK-NEXT: %[[VAL_11:.*]] = emitc.load %[[VAL_7]] : <f32>
9292
// CHECK-NEXT: emitc.assign %[[VAL_11]] : f32 to %[[VAL_4]] : <f32>
9393
// CHECK-NEXT: }
94-
// CHECK-NEXT: %[[VAL_12:.*]] = emitc.lvalue_load %[[VAL_4]] : <f32>
94+
// CHECK-NEXT: %[[VAL_12:.*]] = emitc.load %[[VAL_4]] : <f32>
9595
// CHECK-NEXT: return %[[VAL_12]] : f32
9696
// CHECK-NEXT: }

‎mlir/test/Conversion/SCFToEmitC/if.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func.func @test_if_yield(%arg0: i1, %arg1: f32) -> (i32, f64) {
6666
// CHECK-NEXT: emitc.assign %[[VAL_7]] : i32 to %[[VAL_3]] : <i32>
6767
// CHECK-NEXT: emitc.assign %[[VAL_8]] : f64 to %[[VAL_4]] : <f64>
6868
// CHECK-NEXT: }
69-
// CHECK-NEXT: %[[VAL_9:.*]] = emitc.lvalue_load %[[VAL_3]] : <i32>
70-
// CHECK-NEXT: %[[VAL_10:.*]] = emitc.lvalue_load %[[VAL_4]] : <f64>
69+
// CHECK-NEXT: %[[VAL_9:.*]] = emitc.load %[[VAL_3]] : <i32>
70+
// CHECK-NEXT: %[[VAL_10:.*]] = emitc.load %[[VAL_4]] : <f64>
7171
// CHECK-NEXT: return %[[VAL_9]], %[[VAL_10]] : i32, f64
7272
// CHECK-NEXT: }

‎mlir/test/Conversion/SCFToEmitC/switch.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ func.func @switch_one_result(%arg0 : index) {
9494
// CHECK: emitc.assign %[[VAL_7]] : i32 to %[[VAL_1]] : <i32>
9595
// CHECK: emitc.assign %[[VAL_8]] : f32 to %[[VAL_2]] : <f32>
9696
// CHECK: }
97-
// CHECK: %[[RES_1:.*]] = emitc.lvalue_load %[[VAL_1]] : <i32>
98-
// CHECK: %[[RES_2:.*]] = emitc.lvalue_load %[[VAL_2]] : <f32>
97+
// CHECK: %[[RES_1:.*]] = emitc.load %[[VAL_1]] : <i32>
98+
// CHECK: %[[RES_2:.*]] = emitc.load %[[VAL_2]] : <f32>
9999
// CHECK: return %[[RES_1]], %[[RES_2]] : i32, f32
100100
// CHECK: }
101101
func.func @switch_two_results(%arg0 : index) -> (i32, f32) {

‎mlir/test/Dialect/EmitC/invalid_ops.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func.func @test_expression_illegal_op(%arg0 : i1) -> i32 {
265265
// expected-error @+1 {{'emitc.expression' op contains an unsupported operation}}
266266
%r = emitc.expression : i32 {
267267
%x = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.lvalue<i32>
268-
%y = emitc.lvalue_load %x : <i32>
268+
%y = emitc.load %x : <i32>
269269
emitc.yield %y : i32
270270
}
271271
return %r : i32

‎mlir/test/Dialect/EmitC/ops.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ emitc.global const @myconstant : !emitc.array<2xi16> = dense<2>
246246
func.func @use_global(%i: index) -> f32 {
247247
%0 = emitc.get_global @myglobal : !emitc.array<2xf32>
248248
%1 = emitc.subscript %0[%i] : (!emitc.array<2xf32>, index) -> !emitc.lvalue<f32>
249-
%2 = emitc.lvalue_load %1 : <f32>
249+
%2 = emitc.load %1 : <f32>
250250
return %2 : f32
251251
}
252252

‎mlir/test/Target/Cpp/expressions.mlir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func.func @single_use(%arg0: i32, %arg1: i32, %arg2: i32, %arg3: i32) -> i32 {
4545
emitc.assign %arg0 : i32 to %v : !emitc.lvalue<i32>
4646
emitc.yield
4747
}
48-
%v_load = emitc.lvalue_load %v : !emitc.lvalue<i32>
48+
%v_load = emitc.load %v : !emitc.lvalue<i32>
4949
return %v_load : i32
5050
}
5151

@@ -234,7 +234,7 @@ func.func @multiple_uses(%arg0: i32, %arg1: i32, %arg2: i32, %arg3: i32) -> i32
234234
}
235235
%q = "emitc.variable"(){value = #emitc.opaque<"">} : () -> !emitc.lvalue<i1>
236236
emitc.assign %e : i1 to %q : !emitc.lvalue<i1>
237-
%v_load = emitc.lvalue_load %v : !emitc.lvalue<i32>
237+
%v_load = emitc.load %v : !emitc.lvalue<i32>
238238
return %v_load : i32
239239
}
240240

@@ -291,7 +291,7 @@ func.func @different_expressions(%arg0: i32, %arg1: i32, %arg2: i32, %arg3: i32)
291291
emitc.assign %arg0 : i32 to %v : !emitc.lvalue<i32>
292292
emitc.yield
293293
}
294-
%v_load = emitc.lvalue_load %v : !emitc.lvalue<i32>
294+
%v_load = emitc.load %v : !emitc.lvalue<i32>
295295
return %v_load : i32
296296
}
297297

@@ -339,6 +339,6 @@ func.func @expression_with_subscript_user(%arg0: !emitc.ptr<!emitc.opaque<"void"
339339
emitc.yield %0 : !emitc.ptr<i32>
340340
}
341341
%res = emitc.subscript %0[%c0] : (!emitc.ptr<i32>, i64) -> !emitc.lvalue<i32>
342-
%res_load = emitc.lvalue_load %res : !emitc.lvalue<i32>
342+
%res_load = emitc.load %res : !emitc.lvalue<i32>
343343
return %res_load : i32
344344
}

‎mlir/test/Target/Cpp/for.mlir

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ func.func @test_for_yield() {
4747
emitc.assign %s0 : i32 to %2 : !emitc.lvalue<i32>
4848
emitc.assign %p0 : f32 to %3 : !emitc.lvalue<f32>
4949
emitc.for %iter = %start to %stop step %step {
50-
%4 = emitc.lvalue_load %2 : !emitc.lvalue<i32>
50+
%4 = emitc.load %2 : !emitc.lvalue<i32>
5151
%sn = emitc.call_opaque "add"(%4, %iter) : (i32, index) -> i32
52-
%5 = emitc.lvalue_load %3 : !emitc.lvalue<f32>
52+
%5 = emitc.load %3 : !emitc.lvalue<f32>
5353
%pn = emitc.call_opaque "mul"(%5, %iter) : (f32, index) -> f32
5454
emitc.assign %sn : i32 to %2 : !emitc.lvalue<i32>
5555
emitc.assign %pn : f32 to %3 : !emitc.lvalue<f32>
5656
emitc.yield
5757
}
58-
%6 = emitc.lvalue_load %2 : !emitc.lvalue<i32>
58+
%6 = emitc.load %2 : !emitc.lvalue<i32>
5959
emitc.assign %6 : i32 to %0 : !emitc.lvalue<i32>
60-
%7 = emitc.lvalue_load %3 : !emitc.lvalue<f32>
60+
%7 = emitc.load %3 : !emitc.lvalue<f32>
6161
emitc.assign %7 : f32 to %1 : !emitc.lvalue<f32>
6262

6363
return
@@ -144,17 +144,17 @@ func.func @test_for_yield_2() {
144144
emitc.assign %s0 : i32 to %2 : !emitc.lvalue<i32>
145145
emitc.assign %p0 : f32 to %3 : !emitc.lvalue<f32>
146146
emitc.for %iter = %start to %stop step %step {
147-
%4 = emitc.lvalue_load %2 : !emitc.lvalue<i32>
147+
%4 = emitc.load %2 : !emitc.lvalue<i32>
148148
%sn = emitc.call_opaque "add"(%4, %iter) : (i32, index) -> i32
149-
%5 = emitc.lvalue_load %3 : !emitc.lvalue<f32>
149+
%5 = emitc.load %3 : !emitc.lvalue<f32>
150150
%pn = emitc.call_opaque "mul"(%5, %iter) : (f32, index) -> f32
151151
emitc.assign %sn : i32 to %2 : !emitc.lvalue<i32>
152152
emitc.assign %pn : f32 to %3 : !emitc.lvalue<f32>
153153
emitc.yield
154154
}
155-
%6 = emitc.lvalue_load %2 : !emitc.lvalue<i32>
155+
%6 = emitc.load %2 : !emitc.lvalue<i32>
156156
emitc.assign %6 : i32 to %0 : !emitc.lvalue<i32>
157-
%7 = emitc.lvalue_load %3 : !emitc.lvalue<f32>
157+
%7 = emitc.load %3 : !emitc.lvalue<f32>
158158
emitc.assign %7 : f32 to %1 : !emitc.lvalue<f32>
159159

160160
return

‎mlir/test/Target/Cpp/global.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ emitc.global @opaque_init : !emitc.opaque<"char"> = #emitc.opaque<"CHAR_MIN">
3939

4040
func.func @use_global_scalar_read() -> i32 {
4141
%0 = emitc.get_global @myglobal_int : !emitc.lvalue<i32>
42-
%1 = emitc.lvalue_load %0 : !emitc.lvalue<i32>
42+
%1 = emitc.load %0 : !emitc.lvalue<i32>
4343
return %1 : i32
4444
}
4545
// CPP-DEFAULT-LABEL: int32_t use_global_scalar_read()
@@ -69,7 +69,7 @@ func.func @use_global_scalar_write(%arg0 : i32) {
6969
func.func @use_global_array_read(%i: index) -> f32 {
7070
%0 = emitc.get_global @myglobal : !emitc.array<2xf32>
7171
%1 = emitc.subscript %0[%i] : (!emitc.array<2xf32>, index) -> !emitc.lvalue<f32>
72-
%2 = emitc.lvalue_load %1 : !emitc.lvalue<f32>
72+
%2 = emitc.load %1 : <f32>
7373
return %2 : f32
7474
}
7575
// CPP-DEFAULT-LABEL: float use_global_array_read

‎mlir/test/Target/Cpp/lvalue.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ emitc.func @lvalue_variables(%v1: i32, %v2: i32) -> i32 {
66
emitc.assign %val : i32 to %variable : !emitc.lvalue<i32>
77
%addr = emitc.apply "&"(%variable) : (!emitc.lvalue<i32>) -> !emitc.ptr<i32>
88
emitc.call @zero (%addr) : (!emitc.ptr<i32>) -> ()
9-
%updated_val = emitc.lvalue_load %variable : !emitc.lvalue<i32>
9+
%updated_val = emitc.load %variable : !emitc.lvalue<i32>
1010
%neg_one = "emitc.constant"() {value = -1 : i32} : () -> i32
1111
emitc.assign %neg_one : i32 to %variable : !emitc.lvalue<i32>
1212
emitc.return %updated_val : i32

‎mlir/test/Target/Cpp/member.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ func.func @member(%arg0: !emitc.lvalue<!emitc.opaque<"mystruct">>, %arg1: i32) {
55
emitc.assign %arg1 : i32 to %0 : !emitc.lvalue<i32>
66

77
%1 = "emitc.member" (%arg0) {member = "b"} : (!emitc.lvalue<!emitc.opaque<"mystruct">>) -> !emitc.lvalue<i32>
8-
%2 = emitc.lvalue_load %1 : !emitc.lvalue<i32>
8+
%2 = emitc.load %1 : !emitc.lvalue<i32>
99
%3 = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.lvalue<i32>
1010
emitc.assign %2 : i32 to %3 : !emitc.lvalue<i32>
1111

@@ -24,7 +24,7 @@ func.func @member_of_pointer(%arg0: !emitc.lvalue<!emitc.ptr<!emitc.opaque<"myst
2424
emitc.assign %arg1 : i32 to %0 : !emitc.lvalue<i32>
2525

2626
%1 = "emitc.member_of_ptr" (%arg0) {member = "b"} : (!emitc.lvalue<!emitc.ptr<!emitc.opaque<"mystruct">>>) -> !emitc.lvalue<i32>
27-
%2 = emitc.lvalue_load %1 : !emitc.lvalue<i32>
27+
%2 = emitc.load %1 : !emitc.lvalue<i32>
2828
%3 = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.lvalue<i32>
2929
emitc.assign %2 : i32 to %3 : !emitc.lvalue<i32>
3030

‎mlir/test/Target/Cpp/subscript.mlir

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
func.func @load_store_array(%arg0: !emitc.array<4x8xf32>, %arg1: !emitc.array<3x5xf32>, %arg2: index, %arg3: index) {
55
%0 = emitc.subscript %arg0[%arg2, %arg3] : (!emitc.array<4x8xf32>, index, index) -> !emitc.lvalue<f32>
66
%1 = emitc.subscript %arg1[%arg2, %arg3] : (!emitc.array<3x5xf32>, index, index) -> !emitc.lvalue<f32>
7-
%2 = emitc.lvalue_load %0 : <f32>
7+
%2 = emitc.load %0 : <f32>
88
emitc.assign %2 : f32 to %1 : !emitc.lvalue<f32>
99
return
1010
}
@@ -22,7 +22,7 @@ func.func @load_store_array(%arg0: !emitc.array<4x8xf32>, %arg1: !emitc.array<3x
2222
func.func @load_store_pointer(%arg0: !emitc.ptr<f32>, %arg1: !emitc.ptr<f32>, %arg2: index, %arg3: index) {
2323
%0 = emitc.subscript %arg0[%arg2] : (!emitc.ptr<f32>, index) -> !emitc.lvalue<f32>
2424
%1 = emitc.subscript %arg1[%arg3] : (!emitc.ptr<f32>, index) -> !emitc.lvalue<f32>
25-
%2 = emitc.lvalue_load %0 : <f32>
25+
%2 = emitc.load %0 : <f32>
2626
emitc.assign %2 : f32 to %1 : <f32>
2727
return
2828
}
@@ -40,7 +40,7 @@ func.func @load_store_pointer(%arg0: !emitc.ptr<f32>, %arg1: !emitc.ptr<f32>, %a
4040
func.func @load_store_opaque(%arg0: !emitc.opaque<"std::map<char, int>">, %arg1: !emitc.opaque<"std::map<char, int>">, %arg2: !emitc.opaque<"char">, %arg3: !emitc.opaque<"char">) {
4141
%0 = emitc.subscript %arg0[%arg2] : (!emitc.opaque<"std::map<char, int>">, !emitc.opaque<"char">) -> !emitc.lvalue<!emitc.opaque<"int">>
4242
%1 = emitc.subscript %arg1[%arg3] : (!emitc.opaque<"std::map<char, int>">, !emitc.opaque<"char">) -> !emitc.lvalue<!emitc.opaque<"int">>
43-
%2 = emitc.lvalue_load %0 : <!emitc.opaque<"int">>
43+
%2 = emitc.load %0 : <!emitc.opaque<"int">>
4444
emitc.assign %2 : !emitc.opaque<"int"> to %1 : <!emitc.opaque<"int">>
4545
return
4646
}
@@ -64,12 +64,12 @@ emitc.func @call_arg(%arg0: !emitc.array<4x8xf32>, %i: i32, %j: i16,
6464
%0 = emitc.subscript %arg0[%i, %j] : (!emitc.array<4x8xf32>, i32, i16) -> !emitc.lvalue<f32>
6565
%1 = emitc.subscript %arg0[%j, %k] : (!emitc.array<4x8xf32>, i16, i8) -> !emitc.lvalue<f32>
6666

67-
%2 = emitc.lvalue_load %0 : <f32>
67+
%2 = emitc.load %0 : <f32>
6868
emitc.call @func1 (%2) : (f32) -> ()
69-
%3 = emitc.lvalue_load %1 : <f32>
69+
%3 = emitc.load %1 : <f32>
7070
emitc.call_opaque "func2" (%3) : (f32) -> ()
71-
%4 = emitc.lvalue_load %0 : <f32>
72-
%5 = emitc.lvalue_load %1 : <f32>
71+
%4 = emitc.load %0 : <f32>
72+
%5 = emitc.load %1 : <f32>
7373
emitc.call_opaque "func3" (%4, %5) { args = [1 : index, 0 : index] } : (f32, f32) -> ()
7474
emitc.return
7575
}

0 commit comments

Comments
 (0)