Skip to content

[mlir][spirv] Use verifySymbolUses for spirv.FunctionCall. #159399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 18, 2025
Merged

[mlir][spirv] Use verifySymbolUses for spirv.FunctionCall. #159399

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aed3836
[mlir][spirv] Remove nonlocal call verification.
amd-eochoalo Sep 17, 2025
bc34970
Update tests
amd-eochoalo Sep 17, 2025
f0917d9
Add test case from issue
amd-eochoalo Sep 17, 2025
2ab414f
Revert "[mlir][spirv] Remove nonlocal call verification."
amd-eochoalo Sep 18, 2025
8c6d4c8
Revert "Update tests"
amd-eochoalo Sep 18, 2025
448179a
Move FunctionCallOp verification to verifySymbolUses
amd-eochoalo Sep 18, 2025
fe18af2
Update mlir/test/Dialect/SPIRV/IR/control-flow-ops.mlir
amd-eochoalo Sep 18, 2025
efb4f3a
Merge branch 'main' into eochoa/2025-09-17/issue-159295
amd-eochoalo Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion mlir/include/mlir/Dialect/SPIRV/IR/SPIRVControlFlowOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#define MLIR_DIALECT_SPIRV_IR_CONTROLFLOW_OPS

include "mlir/Dialect/SPIRV/IR/SPIRVBase.td"
include "mlir/IR/SymbolInterfaces.td"
include "mlir/Interfaces/CallInterfaces.td"
include "mlir/Interfaces/ControlFlowInterfaces.td"
include "mlir/Interfaces/SideEffectInterfaces.td"
Expand Down Expand Up @@ -187,7 +188,8 @@ def SPIRV_BranchConditionalOp : SPIRV_Op<"BranchConditional", [
// -----

def SPIRV_FunctionCallOp : SPIRV_Op<"FunctionCall", [
InFunctionScope, DeclareOpInterfaceMethods<CallOpInterface>]> {
InFunctionScope, DeclareOpInterfaceMethods<CallOpInterface>,
DeclareOpInterfaceMethods<SymbolUserOpInterface>]> {
let summary = "Call a function.";

let description = [{
Expand Down
20 changes: 12 additions & 8 deletions mlir/lib/Dialect/SPIRV/IR/ControlFlowOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,23 +151,27 @@ LogicalResult BranchConditionalOp::verify() {
//===----------------------------------------------------------------------===//

LogicalResult FunctionCallOp::verify() {
if (getNumResults() > 1) {
return emitOpError(
"expected callee function to have 0 or 1 result, but provided ")
<< getNumResults();
}
return success();
}

LogicalResult
FunctionCallOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
auto fnName = getCalleeAttr();

auto funcOp = dyn_cast_or_null<spirv::FuncOp>(
SymbolTable::lookupNearestSymbolFrom((*this)->getParentOp(), fnName));
auto funcOp =
symbolTable.lookupNearestSymbolFrom<spirv::FuncOp>(*this, fnName);
if (!funcOp) {
return emitOpError("callee function '")
<< fnName.getValue() << "' not found in nearest symbol table";
}

auto functionType = funcOp.getFunctionType();

if (getNumResults() > 1) {
return emitOpError(
"expected callee function to have 0 or 1 result, but provided ")
<< getNumResults();
}

if (functionType.getNumInputs() != getNumOperands()) {
return emitOpError("has incorrect number of operands for callee: expected ")
<< functionType.getNumInputs() << ", but provided "
Expand Down
29 changes: 29 additions & 0 deletions mlir/test/Dialect/SPIRV/IR/control-flow-ops.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,35 @@ spirv.module Logical GLSL450 {

// -----

"builtin.module"() ({
"spirv.module"() <{
addressing_model = #spirv.addressing_model<Logical>,
memory_model = #spirv.memory_model<GLSL450>
}> ({
"spirv.func"() <{
function_control = #spirv.function_control<None>,
function_type = (f32) -> f32,
sym_name = "bar"
}> ({
^bb0(%arg0: f32):
%0 = "spirv.FunctionCall"(%arg0) <{callee = @foo}> : (f32) -> f32
"spirv.ReturnValue"(%0) : (f32) -> ()
}) : () -> ()
// expected-error @+1 {{requires attribute 'function_type'}}
"spirv.func"() <{
function_control = #spirv.function_control<None>,
message = "2nd parent",
sym_name = "foo"
// This is invalid MLIR because function_type is missing from spirv.func
}> ({
^bb0(%arg0: f32):
"spirv.ReturnValue"(%arg0) : (f32) -> ()
}) : () -> ()
}) : () -> ()
}) : () -> ()

// -----

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"builtin.module"() ({
"spirv.module"() <{
addressing_model = #spirv.addressing_model<Logical>,
memory_model = #spirv.memory_model<GLSL450>
}> ({
"spirv.func"() <{
function_control = #spirv.function_control<None>,
function_type = (f32) -> f32,
sym_name = "bar"
}> ({
^bb0(%arg0: f32):
%0 = "spirv.FunctionCall"(%arg0) <{callee = @foo}> : (f32) -> f32
"spirv.ReturnValue"(%0) : (f32) -> ()
}) : () -> ()
// expected-error @+1 {{requires attribute 'function_type'}}
"spirv.func"() <{
function_control = #spirv.function_control<None>,
message = "2nd parent",
sym_name = "foo"
// This is invalid MLIR because function_type is missing from spirv.func
}> ({
^bb0(%arg0: f32):
"spirv.ReturnValue"(%arg0) : (f32) -> ()
}) : () -> ()
}) : () -> ()
}) : () -> ()
// -----

I think removing this test is also reasonable. Happy to make this change if reviewers agree.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kuhar, can I interpret your thumbs up as "remove this test"? (Got confused by your correction to the comment inside this test.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will merge then but happy to delete this test in another PR.

//===----------------------------------------------------------------------===//
// spirv.mlir.loop
//===----------------------------------------------------------------------===//
Expand Down
Loading