-
Notifications
You must be signed in to change notification settings - Fork 14.3k
[SPIR-V] Support extension toggling and enabling all #85503
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.
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
michalpaszkowski
merged 5 commits into
llvm:main
from
michalpaszkowski:feature_enable_all_extensions
Mar 26, 2024
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
28fd49c
[SPIR-V] Support extension toggling and enabling all
michalpaszkowski 18f1e05
Review changes
michalpaszkowski 5a5e6db
Review changes 2
michalpaszkowski 4154f7a
Review changes 3
michalpaszkowski 74dfa52
Fix clang-format issue
michalpaszkowski File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| //===--- SPIRVCommandLine.cpp ---- Command Line Options ---------*- C++ -*-===// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // This file contains definitions of classes and functions needed for | ||
| // processing, parsing, and using CLI options for the SPIR-V backend. | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #include "SPIRVCommandLine.h" | ||
| #include "llvm/ADT/StringRef.h" | ||
| #include <algorithm> | ||
| #include <map> | ||
|
|
||
| #define DEBUG_TYPE "spirv-commandline" | ||
|
|
||
| using namespace llvm; | ||
|
|
||
| static const std::map<std::string, SPIRV::Extension::Extension> | ||
| SPIRVExtensionMap = { | ||
| {"SPV_EXT_shader_atomic_float_add", | ||
| SPIRV::Extension::Extension::SPV_EXT_shader_atomic_float_add}, | ||
| {"SPV_EXT_shader_atomic_float16_add", | ||
| SPIRV::Extension::Extension::SPV_EXT_shader_atomic_float16_add}, | ||
| {"SPV_EXT_shader_atomic_float_min_max", | ||
| SPIRV::Extension::Extension::SPV_EXT_shader_atomic_float_min_max}, | ||
| {"SPV_INTEL_arbitrary_precision_integers", | ||
| SPIRV::Extension::Extension::SPV_INTEL_arbitrary_precision_integers}, | ||
| {"SPV_INTEL_optnone", SPIRV::Extension::Extension::SPV_INTEL_optnone}, | ||
| {"SPV_INTEL_usm_storage_classes", | ||
| SPIRV::Extension::Extension::SPV_INTEL_usm_storage_classes}, | ||
| {"SPV_INTEL_subgroups", | ||
| SPIRV::Extension::Extension::SPV_INTEL_subgroups}, | ||
| {"SPV_KHR_uniform_group_instructions", | ||
| SPIRV::Extension::Extension::SPV_KHR_uniform_group_instructions}, | ||
| {"SPV_KHR_no_integer_wrap_decoration", | ||
| SPIRV::Extension::Extension::SPV_KHR_no_integer_wrap_decoration}, | ||
| {"SPV_KHR_float_controls", | ||
| SPIRV::Extension::Extension::SPV_KHR_float_controls}, | ||
| {"SPV_KHR_expect_assume", | ||
| SPIRV::Extension::Extension::SPV_KHR_expect_assume}, | ||
| {"SPV_KHR_bit_instructions", | ||
| SPIRV::Extension::Extension::SPV_KHR_bit_instructions}, | ||
| {"SPV_KHR_linkonce_odr", | ||
| SPIRV::Extension::Extension::SPV_KHR_linkonce_odr}, | ||
| {"SPV_INTEL_bfloat16_conversion", | ||
| SPIRV::Extension::Extension::SPV_INTEL_bfloat16_conversion}, | ||
| {"SPV_KHR_subgroup_rotate", | ||
| SPIRV::Extension::Extension::SPV_KHR_subgroup_rotate}, | ||
| {"SPV_INTEL_variable_length_array", | ||
| SPIRV::Extension::Extension::SPV_INTEL_variable_length_array}, | ||
| {"SPV_INTEL_function_pointers", | ||
| SPIRV::Extension::Extension::SPV_INTEL_function_pointers}, | ||
| }; | ||
|
|
||
| bool SPIRVExtensionsParser::parse(cl::Option &O, llvm::StringRef ArgName, | ||
| llvm::StringRef ArgValue, | ||
| std::set<SPIRV::Extension::Extension> &Vals) { | ||
| llvm::SmallVector<llvm::StringRef, 10> Tokens; | ||
| ArgValue.split(Tokens, ",", -1, false); | ||
| std::sort(Tokens.begin(), Tokens.end()); | ||
|
|
||
| std::set<SPIRV::Extension::Extension> EnabledExtensions; | ||
|
|
||
| for (const auto &Token : Tokens) { | ||
| if (Token == "all") { | ||
| for (const auto &[ExtensionName, ExtensionEnum] : SPIRVExtensionMap) | ||
| EnabledExtensions.insert(ExtensionEnum); | ||
|
|
||
| continue; | ||
| } | ||
|
|
||
| if (Token.empty() || (!Token.starts_with("+") && !Token.starts_with("-"))) | ||
| return O.error("Invalid extension list format: " + Token.str()); | ||
|
|
||
| llvm::StringRef ExtensionName = Token.substr(1); | ||
| auto NameValuePair = SPIRVExtensionMap.find(ExtensionName.str()); | ||
|
|
||
| if (NameValuePair == SPIRVExtensionMap.end()) | ||
| return O.error("Unknown SPIR-V extension: " + Token.str()); | ||
|
|
||
| if (Token.starts_with("+")) { | ||
| EnabledExtensions.insert(NameValuePair->second); | ||
| } else if (EnabledExtensions.count(NameValuePair->second)) { | ||
| if (std::find(Tokens.begin(), Tokens.end(), "+" + ExtensionName.str()) != | ||
| Tokens.end()) | ||
| return O.error( | ||
| "Extension cannot be allowed and disallowed at the same time: " + | ||
| ExtensionName.str()); | ||
|
|
||
| EnabledExtensions.erase(NameValuePair->second); | ||
| } | ||
| } | ||
|
|
||
| Vals = std::move(EnabledExtensions); | ||
| return false; | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| //===--- SPIRVCommandLine.h ---- Command Line Options -----------*- C++ -*-===// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // This file contains classes and functions needed for processing, parsing, and | ||
| // using CLI options for the SPIR-V backend. | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #ifndef LLVM_LIB_TARGET_SPIRV_COMMANDLINE_H | ||
| #define LLVM_LIB_TARGET_SPIRV_COMMANDLINE_H | ||
|
|
||
| #include "MCTargetDesc/SPIRVBaseInfo.h" | ||
| #include "llvm/Support/CommandLine.h" | ||
| #include <set> | ||
|
|
||
| namespace llvm { | ||
|
|
||
| /// Command line parser for toggling SPIR-V extensions. | ||
| struct SPIRVExtensionsParser | ||
| : public cl::parser<std::set<SPIRV::Extension::Extension>> { | ||
| public: | ||
| SPIRVExtensionsParser(cl::Option &O) | ||
| : cl::parser<std::set<SPIRV::Extension::Extension>>(O) {} | ||
|
|
||
| /// Parses SPIR-V extension name from CLI arguments. | ||
| /// | ||
| /// \return Returns true on error. | ||
| bool parse(cl::Option &O, StringRef ArgName, StringRef ArgValue, | ||
| std::set<SPIRV::Extension::Extension> &Vals); | ||
| }; | ||
|
|
||
| } // namespace llvm | ||
| #endif // LLVM_LIB_TARGET_SPIRV_COMMANDLINE_H | ||
This file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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
2 changes: 1 addition & 1 deletion
2
...est/CodeGen/SPIRV/extensions/SPV_EXT_shader_atomic_float_add/atomicrmw_faddfsub_double.ll
This file contains hidden or 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
2 changes: 1 addition & 1 deletion
2
...test/CodeGen/SPIRV/extensions/SPV_EXT_shader_atomic_float_add/atomicrmw_faddfsub_float.ll
This file contains hidden or 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
4 changes: 2 additions & 2 deletions
4
.../test/CodeGen/SPIRV/extensions/SPV_EXT_shader_atomic_float_add/atomicrmw_faddfsub_half.ll
This file contains hidden or 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
2 changes: 1 addition & 1 deletion
2
...CodeGen/SPIRV/extensions/SPV_EXT_shader_atomic_float_min_max/atomicrmw_fminfmax_double.ll
This file contains hidden or 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
2 changes: 1 addition & 1 deletion
2
.../CodeGen/SPIRV/extensions/SPV_EXT_shader_atomic_float_min_max/atomicrmw_fminfmax_float.ll
This file contains hidden or 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
2 changes: 1 addition & 1 deletion
2
...t/CodeGen/SPIRV/extensions/SPV_EXT_shader_atomic_float_min_max/atomicrmw_fminfmax_half.ll
This file contains hidden or 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
2 changes: 1 addition & 1 deletion
2
llvm/test/CodeGen/SPIRV/extensions/SPV_INTEL_arbitrary_precision_integers.ll
This file contains hidden or 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
2 changes: 1 addition & 1 deletion
2
llvm/test/CodeGen/SPIRV/extensions/SPV_INTEL_bfloat16_conversion/bfloat16-conv-negative1.ll
This file contains hidden or 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
2 changes: 1 addition & 1 deletion
2
llvm/test/CodeGen/SPIRV/extensions/SPV_INTEL_bfloat16_conversion/bfloat16-conv-negative2.ll
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.