[Handshake] Remove cmerge return type inference #5021
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit removes the InferTypeOpInterface from ControlMergeOp because it no longer made sense w.r.t. the variable type of the index result. Additionally, when parsing a control_merge with an index type different than "index", it would raise an error because of the mismatch between the parsed and inferred types. Example code that would trigger it below. ``` handshake.func @test(%arg1: i32, %arg2: i32) { %result, %index = control_merge %arg1, %arg2 : i32, i64 return } ``` The commit also adds a custom builder for ControlMergeOp to allow creating the operation without explicitly providing return types. The builder defaults to an Index type for the op's second result.
lucas-rami
requested review from
Dinistro and
mortbopet
and removed request for
Dinistro
lucas-rami
changed the title
Dinistro
approved these changes
Apr 12, 2023
| // By default, the index result has an Index type | ||
| SmallVector<Type> resultTypes { operands[0].getType(), | ||
| $_builder.getIndexType()}; | ||
| $_state.addTypes(resultTypes); |
There was a problem hiding this comment.
NIT: Is itppssible to build an ArrayRef here, instead of building a SmallVector? Alternatively, you could also use two calls to addType
test/Dialect/Handshake/errors.mlir
Outdated
| %0 = mux %arg0 [%arg1, %arg2, %arg3] : i1, i32 | ||
| return %0 : i32 | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| handshake.func @invalid_cmerge_unsupported_index(%arg1: i32, %arg2: i32) -> tensor<i1> { | ||
| // expected-error @+1 {{unsupported type for indexing value: 'tensor<i1>'}} |
There was a problem hiding this comment.
Suggested change
| // expected-error @+1 {{unsupported type for indexing value: 'tensor<i1>'}} | |
| // expected-error @below {{unsupported type for indexing value: 'tensor<i1>'}} |
test/Dialect/Handshake/errors.mlir
Outdated
| %0 = mux %arg0 [%arg1, %arg2, %arg3] : i1, i32 | ||
| return %0 : i32 | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| handshake.func @invalid_cmerge_unsupported_index(%arg1: i32, %arg2: i32) -> tensor<i1> { | ||
| // expected-error @+1 {{unsupported type for indexing value: 'tensor<i1>'}} |
There was a problem hiding this comment.
Suggested change
| // expected-error @+1 {{unsupported type for indexing value: 'tensor<i1>'}} | |
| // expected-error @below {{unsupported type for indexing value: 'tensor<i1>'}} |
test/Dialect/Handshake/errors.mlir
Outdated
| // ----- | ||
|
|
||
| handshake.func @invalid_cmerge_narrow_index(%arg1: i32, %arg2: i32, %arg3: i32) -> i1 { | ||
| // expected-error @+1 {{bitwidth of indexing value is 1, which can index into 2 operands, but found 3 operands}} |
mortbopet
approved these changes
Apr 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit removes the
InferTypeOpInterfacefromControlMergeOpbecause it no longer made sense w.r.t. the variable type of the index result introduced in #4929. Additionally, when parsing a control_merge with an index type different thanindex, it would raise an error because of the mismatch between the parsed and inferred types. Example code that would trigger it below.The commit also adds a custom builder for
ControlMergeOp(that was previously auto-generated byInferTypeOpInterface) to allow creating the operation without explicitly providing return types. The builder defaults to anIndextype for the op's second result.