From 62f5b09b11b1da42274371b1f7535f6f2ab11485 Mon Sep 17 00:00:00 2001 From: Viktoria Maximova Date: Tue, 16 Apr 2024 16:03:18 +0200 Subject: [PATCH] [SPIR-V 1.5] Move the version to supported Original commit: a104311 --- README.md | 2 +- docs/SPIRVVersionsAndExtensionsHandling.rst | 2 +- tools/llvm-spirv/llvm-spirv.cpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e44ccf6eb8..e89b909be0 100644 --- a/README.md +++ b/README.md @@ -202,7 +202,7 @@ the version of the SPIR-V file which is being generated/consumed. the input file and emit an error if the SPIR-V version in it is higher than one specified via this option. -Allowed values are `1.0`, `1.1`, `1.2`, `1.3`, and `1.4`. +Allowed values are `1.0`, `1.1`, `1.2`, `1.3`, `1.4`, and `1.5`. More information can be found in [SPIR-V versions and extensions handling](docs/SPIRVVersionsAndExtensionsHandling.rst) diff --git a/docs/SPIRVVersionsAndExtensionsHandling.rst b/docs/SPIRVVersionsAndExtensionsHandling.rst index 90fd05e9e7..03f2c057ed 100644 --- a/docs/SPIRVVersionsAndExtensionsHandling.rst +++ b/docs/SPIRVVersionsAndExtensionsHandling.rst @@ -65,7 +65,7 @@ the version of the SPIR-V file which is being generated/consumed. one exception: resulting SPIR-V version cannot be raised higher than specified by this option. -Allowed values are ``1.0``, ``1.1``, ``1.2``, ``1.3``, and ``1.4``. +Allowed values are ``1.0``, ``1.1``, ``1.2``, ``1.3``, ``1.4``, and ``1.5``. .. warning:: These two options are mutually exclusive and cannot be specified at the diff --git a/tools/llvm-spirv/llvm-spirv.cpp b/tools/llvm-spirv/llvm-spirv.cpp index ce010e077f..4957f62b60 100644 --- a/tools/llvm-spirv/llvm-spirv.cpp +++ b/tools/llvm-spirv/llvm-spirv.cpp @@ -110,8 +110,7 @@ static cl::opt MaxSPIRVVersion( clEnumValN(VersionNumber::SPIRV_1_2, "1.2", "SPIR-V 1.2"), clEnumValN(VersionNumber::SPIRV_1_3, "1.3", "SPIR-V 1.3"), clEnumValN(VersionNumber::SPIRV_1_4, "1.4", "SPIR-V 1.4"), - clEnumValN(VersionNumber::SPIRV_1_5, "1.5", - "SPIR-V 1.5 (experimental)")), + clEnumValN(VersionNumber::SPIRV_1_5, "1.5", "SPIR-V 1.5")), cl::init(VersionNumber::MaximumVersion)); static cl::list