This is an archive of the discontinued LLVM Phabricator instance.

Differential D113171

Fix `insertFunctionArguments()` block argument order.
ClosedPublic

Authored by csigg on Nov 4 2021, 12:57 AM.

Details

Reviewers
ftynse
rriddle
Commits
rGfce529fc6e83: Fix `insertFunctionArguments()` block argument order.

Diff Detail

Event Timeline

csigg created this revision.Nov 4 2021, 12:57 AM
Herald added a reviewer: rriddle. · View Herald TranscriptNov 4 2021, 12:57 AM
Herald added subscribers: wenzhicui, wrengr, Chia-hungDuan and 20 others. · View Herald Transcript
csigg requested review of this revision.Nov 4 2021, 12:57 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 4 2021, 12:57 AM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
csigg updated this revision to Diff 384680.Nov 4 2021, 1:06 AM

Don't print ops in generic form, let the verifier handle errors instead.

Harbormaster completed remote builds in B132399: Diff 384680.Nov 4 2021, 1:15 AM
rriddle accepted this revision.Nov 4 2021, 8:08 AM
This revision is now accepted and ready to land.Nov 4 2021, 8:08 AM
rriddle added a comment.Nov 4 2021, 8:09 AM

Thanks for the fix!

Closed by commit rGfce529fc6e83: Fix `insertFunctionArguments()` block argument order. (authored by csigg). · Explain WhyNov 5 2021, 2:08 AM
This revision was automatically updated to reflect the committed changes.
csigg added a commit: rGfce529fc6e83: Fix `insertFunctionArguments()` block argument order..

Revision Contents

PathSize
mlir/
lib/
IR/
2 lines
test/
IR/
38 lines

Diff 384991

mlir/lib/IR/FunctionSupport.cpp

Show First 20 Lines • Show All 158 Lines • ▼ Show 20 Lines if (oldArgAttrs || !argAttrs.empty()) {
} }
migrate(originalNumArgs); migrate(originalNumArgs);
setAllArgAttrDicts(op, newArgAttrs); setAllArgAttrDicts(op, newArgAttrs);
} }
// Update the function type and any entry block arguments. // Update the function type and any entry block arguments.
op->setAttr(getTypeAttrName(), TypeAttr::get(newType)); op->setAttr(getTypeAttrName(), TypeAttr::get(newType));
for (unsigned i = 0, e = argIndices.size(); i < e; ++i) for (unsigned i = 0, e = argIndices.size(); i < e; ++i)
entry.insertArgument(argIndices[i], argTypes[i], entry.insertArgument(argIndices[i] + i, argTypes[i],
argLocs.empty() ? Optional<Location>{} : argLocs[i]); argLocs.empty() ? Optional<Location>{} : argLocs[i]);
} }
void mlir::function_like_impl::insertFunctionResults( void mlir::function_like_impl::insertFunctionResults(
Operation *op, ArrayRef<unsigned> resultIndices, TypeRange resultTypes, Operation *op, ArrayRef<unsigned> resultIndices, TypeRange resultTypes,
ArrayRef<DictionaryAttr> resultAttrs, unsigned originalNumResults, ArrayRef<DictionaryAttr> resultAttrs, unsigned originalNumResults,
Type newType) { Type newType) {
assert(resultIndices.size() == resultTypes.size()); assert(resultIndices.size() == resultTypes.size());
▲ Show 20 Lines • Show All 143 Lines • Show Last 20 Lines

mlir/test/IR/test-func-insert-arg.mlir

// RUN: mlir-opt %s -test-func-insert-arg -split-input-file | FileCheck %s // RUN: mlir-opt %s -test-func-insert-arg -split-input-file | FileCheck %s
// CHECK: func @f(%arg0: f32 {test.A}) // CHECK: func @f(%arg0: i1 {test.A})
func @f() attributes {test.insert_args = [ func @f() attributes {test.insert_args = [
[0, f32, {test.A}]]} { [0, i1, {test.A}]]} {
return return
} }
// ----- // -----
// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B}) // CHECK: func @f(%arg0: i1 {test.A}, %arg1: i2 {test.B})
func @f(%arg0: f32 {test.B}) attributes {test.insert_args = [ func @f(%arg0: i2 {test.B}) attributes {test.insert_args = [
[0, f32, {test.A}]]} { [0, i1, {test.A}]]} {
return return
} }
// ----- // -----
// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B}) // CHECK: func @f(%arg0: i1 {test.A}, %arg1: i2 {test.B})
func @f(%arg0: f32 {test.A}) attributes {test.insert_args = [ func @f(%arg0: i1 {test.A}) attributes {test.insert_args = [
[1, f32, {test.B}]]} { [1, i2, {test.B}]]} {
return return
} }
// ----- // -----
// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B}, %arg2: f32 {test.C}) // CHECK: func @f(%arg0: i1 {test.A}, %arg1: i2 {test.B}, %arg2: i3 {test.C})
func @f(%arg0: f32 {test.A}, %arg1: f32 {test.C}) attributes {test.insert_args = [ func @f(%arg0: i1 {test.A}, %arg1: i3 {test.C}) attributes {test.insert_args = [
[1, f32, {test.B}]]} { [1, i2, {test.B}]]} {
return return
} }
// ----- // -----
// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B}, %arg2: f32 {test.C}) // CHECK: func @f(%arg0: i1 {test.A}, %arg1: i2 {test.B}, %arg2: i3 {test.C})
func @f(%arg0: f32 {test.B}) attributes {test.insert_args = [ func @f(%arg0: i2 {test.B}) attributes {test.insert_args = [
[0, f32, {test.A}], [0, i1, {test.A}],
[1, f32, {test.C}]]} { [1, i3, {test.C}]]} {
return return
} }
// ----- // -----
// CHECK: func @f(%arg0: f32 {test.A}, %arg1: f32 {test.B}, %arg2: f32 {test.C}) // CHECK: func @f(%arg0: i1 {test.A}, %arg1: i2 {test.B}, %arg2: i3 {test.C})
func @f(%arg0: f32 {test.C}) attributes {test.insert_args = [ func @f(%arg0: i3 {test.C}) attributes {test.insert_args = [
[0, f32, {test.A}], [0, i1, {test.A}],
[0, f32, {test.B}]]} { [0, i2, {test.B}]]} {
return return
} }