23326b9f17
- Fixed symbol insertion into `symNameToModuleMap`. Insertion needs to happen whether symbols are renamed or not. - Added check for the VCE triple and avoid dropping it. - Disabled function deduplication. It requires more careful rules. Right now it can remove different functions. - Added tests for symbol rename listener. - And some other code/comment cleanups. Reviewed By: ergawy Differential Revision: https://reviews.llvm.org/D106886
274 lines
7.3 KiB
MLIR
274 lines
7.3 KiB
MLIR
// RUN: mlir-opt -test-spirv-module-combiner -split-input-file -verify-diagnostics %s | FileCheck %s
|
|
|
|
// Deduplicate 2 global variables with the same descriptor set and binding.
|
|
|
|
// CHECK: module {
|
|
// CHECK-NEXT: spv.module Logical GLSL450 {
|
|
// CHECK-NEXT: spv.GlobalVariable @foo
|
|
|
|
// CHECK-NEXT: spv.func @use_foo
|
|
// CHECK-NEXT: spv.mlir.addressof @foo
|
|
// CHECK-NEXT: spv.Load
|
|
// CHECK-NEXT: spv.ReturnValue
|
|
// CHECK-NEXT: }
|
|
|
|
// CHECK-NEXT: spv.func @use_bar
|
|
// CHECK-NEXT: spv.mlir.addressof @foo
|
|
// CHECK-NEXT: spv.Load
|
|
// CHECK-NEXT: spv.FAdd
|
|
// CHECK-NEXT: spv.ReturnValue
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: }
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.GlobalVariable @foo bind(1, 0) : !spv.ptr<f32, Input>
|
|
|
|
spv.func @use_foo() -> f32 "None" {
|
|
%0 = spv.mlir.addressof @foo : !spv.ptr<f32, Input>
|
|
%1 = spv.Load "Input" %0 : f32
|
|
spv.ReturnValue %1 : f32
|
|
}
|
|
}
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.GlobalVariable @bar bind(1, 0) : !spv.ptr<f32, Input>
|
|
|
|
spv.func @use_bar() -> f32 "None" {
|
|
%0 = spv.mlir.addressof @bar : !spv.ptr<f32, Input>
|
|
%1 = spv.Load "Input" %0 : f32
|
|
%2 = spv.FAdd %1, %1 : f32
|
|
spv.ReturnValue %2 : f32
|
|
}
|
|
}
|
|
|
|
// -----
|
|
|
|
// Deduplicate 2 global variables with the same descriptor set and binding but different types.
|
|
|
|
// CHECK: module {
|
|
// CHECK-NEXT: spv.module Logical GLSL450 {
|
|
// CHECK-NEXT: spv.GlobalVariable @foo bind(1, 0)
|
|
|
|
// CHECK-NEXT: spv.GlobalVariable @bar bind(1, 0)
|
|
|
|
// CHECK-NEXT: spv.func @use_bar
|
|
// CHECK-NEXT: spv.mlir.addressof @bar
|
|
// CHECK-NEXT: spv.Load
|
|
// CHECK-NEXT: spv.ReturnValue
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: }
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.GlobalVariable @foo bind(1, 0) : !spv.ptr<i32, Input>
|
|
}
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.GlobalVariable @bar bind(1, 0) : !spv.ptr<f32, Input>
|
|
|
|
spv.func @use_bar() -> f32 "None" {
|
|
%0 = spv.mlir.addressof @bar : !spv.ptr<f32, Input>
|
|
%1 = spv.Load "Input" %0 : f32
|
|
spv.ReturnValue %1 : f32
|
|
}
|
|
}
|
|
|
|
// -----
|
|
|
|
// Deduplicate 2 global variables with the same built-in attribute.
|
|
|
|
// CHECK: module {
|
|
// CHECK-NEXT: spv.module Logical GLSL450 {
|
|
// CHECK-NEXT: spv.GlobalVariable @foo built_in("GlobalInvocationId")
|
|
// CHECK-NEXT: spv.func @use_bar
|
|
// CHECK-NEXT: spv.mlir.addressof @foo
|
|
// CHECK-NEXT: spv.Load
|
|
// CHECK-NEXT: spv.ReturnValue
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: }
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.GlobalVariable @foo built_in("GlobalInvocationId") : !spv.ptr<vector<3xi32>, Input>
|
|
}
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.GlobalVariable @bar built_in("GlobalInvocationId") : !spv.ptr<vector<3xi32>, Input>
|
|
|
|
spv.func @use_bar() -> vector<3xi32> "None" {
|
|
%0 = spv.mlir.addressof @bar : !spv.ptr<vector<3xi32>, Input>
|
|
%1 = spv.Load "Input" %0 : vector<3xi32>
|
|
spv.ReturnValue %1 : vector<3xi32>
|
|
}
|
|
}
|
|
|
|
// -----
|
|
|
|
// Deduplicate 2 spec constants with the same spec ID.
|
|
|
|
// CHECK: module {
|
|
// CHECK-NEXT: spv.module Logical GLSL450 {
|
|
// CHECK-NEXT: spv.SpecConstant @foo spec_id(5)
|
|
|
|
// CHECK-NEXT: spv.func @use_foo()
|
|
// CHECK-NEXT: %0 = spv.mlir.referenceof @foo
|
|
// CHECK-NEXT: spv.ReturnValue
|
|
// CHECK-NEXT: }
|
|
|
|
// CHECK-NEXT: spv.func @use_bar()
|
|
// CHECK-NEXT: %0 = spv.mlir.referenceof @foo
|
|
// CHECK-NEXT: spv.FAdd
|
|
// CHECK-NEXT: spv.ReturnValue
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: }
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.SpecConstant @foo spec_id(5) = 1. : f32
|
|
|
|
spv.func @use_foo() -> (f32) "None" {
|
|
%0 = spv.mlir.referenceof @foo : f32
|
|
spv.ReturnValue %0 : f32
|
|
}
|
|
}
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.SpecConstant @bar spec_id(5) = 1. : f32
|
|
|
|
spv.func @use_bar() -> (f32) "None" {
|
|
%0 = spv.mlir.referenceof @bar : f32
|
|
%1 = spv.FAdd %0, %0 : f32
|
|
spv.ReturnValue %1 : f32
|
|
}
|
|
}
|
|
|
|
// -----
|
|
|
|
// Don't deduplicate functions with similar ops but different operands.
|
|
|
|
// CHECK: spv.module Logical GLSL450 {
|
|
// CHECK-NEXT: spv.func @foo(%[[ARG0:.+]]: f32, %[[ARG1:.+]]: f32, %[[ARG2:.+]]: f32)
|
|
// CHECK-NEXT: %[[ADD:.+]] = spv.FAdd %[[ARG0]], %[[ARG1]] : f32
|
|
// CHECK-NEXT: %[[MUL:.+]] = spv.FMul %[[ADD]], %[[ARG2]] : f32
|
|
// CHECK-NEXT: spv.ReturnValue %[[MUL]] : f32
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: spv.func @foo_1(%[[ARG0:.+]]: f32, %[[ARG1:.+]]: f32, %[[ARG2:.+]]: f32)
|
|
// CHECK-NEXT: %[[ADD:.+]] = spv.FAdd %[[ARG0]], %[[ARG2]] : f32
|
|
// CHECK-NEXT: %[[MUL:.+]] = spv.FMul %[[ADD]], %[[ARG1]] : f32
|
|
// CHECK-NEXT: spv.ReturnValue %[[MUL]] : f32
|
|
// CHECK-NEXT: }
|
|
// CHECK-NEXT: }
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.func @foo(%a: f32, %b: f32, %c: f32) -> f32 "None" {
|
|
%add = spv.FAdd %a, %b: f32
|
|
%mul = spv.FMul %add, %c: f32
|
|
spv.ReturnValue %mul: f32
|
|
}
|
|
}
|
|
|
|
spv.module Logical GLSL450 {
|
|
spv.func @foo(%a: f32, %b: f32, %c: f32) -> f32 "None" {
|
|
%add = spv.FAdd %a, %c: f32
|
|
%mul = spv.FMul %add, %b: f32
|
|
spv.ReturnValue %mul: f32
|
|
}
|
|
}
|
|
|
|
// -----
|
|
|
|
// TODO: re-enable this test once we have better function deduplication.
|
|
|
|
// XXXXX: module {
|
|
// XXXXX-NEXT: spv.module Logical GLSL450 {
|
|
// XXXXX-NEXT: spv.SpecConstant @bar spec_id(5)
|
|
|
|
// XXXXX-NEXT: spv.func @foo(%arg0: f32)
|
|
// XXXXX-NEXT: spv.ReturnValue
|
|
// XXXXX-NEXT: }
|
|
|
|
// XXXXX-NEXT: spv.func @foo_different_body(%arg0: f32)
|
|
// XXXXX-NEXT: spv.mlir.referenceof
|
|
// XXXXX-NEXT: spv.ReturnValue
|
|
// XXXXX-NEXT: }
|
|
|
|
// XXXXX-NEXT: spv.func @baz(%arg0: i32)
|
|
// XXXXX-NEXT: spv.ReturnValue
|
|
// XXXXX-NEXT: }
|
|
|
|
// XXXXX-NEXT: spv.func @baz_no_return(%arg0: i32)
|
|
// XXXXX-NEXT: spv.Return
|
|
// XXXXX-NEXT: }
|
|
|
|
// XXXXX-NEXT: spv.func @baz_no_return_different_control
|
|
// XXXXX-NEXT: spv.Return
|
|
// XXXXX-NEXT: }
|
|
|
|
// XXXXX-NEXT: spv.func @baz_no_return_another_control
|
|
// XXXXX-NEXT: spv.Return
|
|
// XXXXX-NEXT: }
|
|
|
|
// XXXXX-NEXT: spv.func @kernel
|
|
// XXXXX-NEXT: spv.Return
|
|
// XXXXX-NEXT: }
|
|
|
|
// XXXXX-NEXT: spv.func @kernel_different_attr
|
|
// XXXXX-NEXT: spv.Return
|
|
// XXXXX-NEXT: }
|
|
// XXXXX-NEXT: }
|
|
// XXXXX-NEXT: }
|
|
|
|
module {
|
|
spv.module Logical GLSL450 {
|
|
spv.SpecConstant @bar spec_id(5) = 1. : f32
|
|
|
|
spv.func @foo(%arg0: f32) -> (f32) "None" {
|
|
spv.ReturnValue %arg0 : f32
|
|
}
|
|
|
|
spv.func @foo_duplicate(%arg0: f32) -> (f32) "None" {
|
|
spv.ReturnValue %arg0 : f32
|
|
}
|
|
|
|
spv.func @foo_different_body(%arg0: f32) -> (f32) "None" {
|
|
%0 = spv.mlir.referenceof @bar : f32
|
|
spv.ReturnValue %arg0 : f32
|
|
}
|
|
|
|
spv.func @baz(%arg0: i32) -> (i32) "None" {
|
|
spv.ReturnValue %arg0 : i32
|
|
}
|
|
|
|
spv.func @baz_no_return(%arg0: i32) "None" {
|
|
spv.Return
|
|
}
|
|
|
|
spv.func @baz_no_return_duplicate(%arg0: i32) -> () "None" {
|
|
spv.Return
|
|
}
|
|
|
|
spv.func @baz_no_return_different_control(%arg0: i32) -> () "Inline" {
|
|
spv.Return
|
|
}
|
|
|
|
spv.func @baz_no_return_another_control(%arg0: i32) -> () "Inline|Pure" {
|
|
spv.Return
|
|
}
|
|
|
|
spv.func @kernel(
|
|
%arg0: f32,
|
|
%arg1: !spv.ptr<!spv.struct<(!spv.array<12 x f32>)>, CrossWorkgroup>) "None"
|
|
attributes {spv.entry_point_abi = {local_size = dense<[32, 1, 1]> : vector<3xi32>}} {
|
|
spv.Return
|
|
}
|
|
|
|
spv.func @kernel_different_attr(
|
|
%arg0: f32,
|
|
%arg1: !spv.ptr<!spv.struct<(!spv.array<12 x f32>)>, CrossWorkgroup>) "None"
|
|
attributes {spv.entry_point_abi = {local_size = dense<[64, 1, 1]> : vector<3xi32>}} {
|
|
spv.Return
|
|
}
|
|
}
|
|
}
|