Skip to content

[SPIR-V] Prefer SPV_INTEL_optnone over SPV_EXT_optnone when both extensions are available #122082

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 2 commits into from
Jan 9, 2025
Merged

[SPIR-V] Prefer SPV_INTEL_optnone over SPV_EXT_optnone when both extensions are available #122082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c40dbe6
Prefer SPV_INTEL_optnone over SPV_EXT_optnone when both extensions ar…
VyacheslavLevytskyy Jan 8, 2025
72d9415
remove unneeded check lines
VyacheslavLevytskyy Jan 8, 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
8 changes: 4 additions & 4 deletions llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,12 +1807,12 @@ static void collectReqs(const Module &M, SPIRV::ModuleAnalysisInfo &MAI,
SPIRV::ExecutionMode::VecTypeHint, ST);

if (F.hasOptNone()) {
if (ST.canUseExtension(SPIRV::Extension::SPV_EXT_optnone)) {
MAI.Reqs.addExtension(SPIRV::Extension::SPV_EXT_optnone);
MAI.Reqs.addCapability(SPIRV::Capability::OptNoneEXT);
} else if (ST.canUseExtension(SPIRV::Extension::SPV_INTEL_optnone)) {
if (ST.canUseExtension(SPIRV::Extension::SPV_INTEL_optnone)) {
MAI.Reqs.addExtension(SPIRV::Extension::SPV_INTEL_optnone);
MAI.Reqs.addCapability(SPIRV::Capability::OptNoneINTEL);
} else if (ST.canUseExtension(SPIRV::Extension::SPV_EXT_optnone)) {
MAI.Reqs.addExtension(SPIRV::Extension::SPV_EXT_optnone);
MAI.Reqs.addCapability(SPIRV::Capability::OptNoneEXT);
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions llvm/test/CodeGen/SPIRV/extensions/SPV_EXT_optnone.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,19 @@
; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown --spirv-ext=+SPV_EXT_optnone %s -o - -filetype=obj | spirv-val %}
; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown %s -o - -filetype=obj | spirv-val %}

; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv64-unknown-unknown --spirv-ext=+SPV_EXT_optnone,+SPV_INTEL_optnone %s -o - | FileCheck %s --check-prefixes=CHECK-TWO-EXTENSIONS
; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv64-unknown-unknown --spirv-ext=all %s -o - | FileCheck %s --check-prefixes=CHECK-ALL-EXTENSIONS

; CHECK-EXTENSION: OpCapability OptNoneEXT
; CHECK-EXTENSION: OpExtension "SPV_EXT_optnone"
; CHECK-NO-EXTENSION-NOT: OpCapability OptNoneINTEL
; CHECK-NO-EXTENSION-NOT: OpCapability OptNoneEXT
; CHECK-NO-EXTENSION-NOT: OpExtension "SPV_INTEL_optnone"
; CHECK-NO-EXTENSION-NOT: OpExtension "SPV_EXT_optnone"

; CHECK-TWO-EXTENSIONS: OpExtension "SPV_INTEL_optnone"
; CHECK-ALL-EXTENSIONS: OpExtension "SPV_INTEL_optnone"

define spir_func void @foo() #0 {
; CHECK-EXTENSION: %[[#]] = OpFunction %[[#]] DontInline|OptNoneEXT %[[#]]
entry:
Expand Down
Loading