Skip to content

Commit 3f7abe7

Browse files
vmaksimovmaksimo
committed
Incorporate SPV_KHR_integer_dot_product into SPIR-V 1.6 (KhronosGroup#2584)
1 parent e7933da commit 3f7abe7

File tree

3 files changed

+47
-15
lines changed

3 files changed

+47
-15
lines changed

‎lib/SPIRV/libSPIRV/SPIRVInstruction.h‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2965,7 +2965,9 @@ class SPIRVDotKHRBase : public SPIRVInstTemplateBase {
29652965
}
29662966

29672967
std::optional<ExtensionID> getRequiredExtension() const override {
2968-
return ExtensionID::SPV_KHR_integer_dot_product;
2968+
if (!Module->isAllowedToUseVersion(VersionNumber::SPIRV_1_6))
2969+
return ExtensionID::SPV_KHR_integer_dot_product;
2970+
return {};
29692971
}
29702972

29712973
void validate() const override {
@@ -3025,6 +3027,12 @@ class SPIRVDotKHRBase : public SPIRVInstTemplateBase {
30253027

30263028
llvm_unreachable("No mapping for argument type to capability.");
30273029
}
3030+
3031+
SPIRVWord getRequiredSPIRVVersion() const override {
3032+
if (Module->isAllowedToUseVersion(VersionNumber::SPIRV_1_6))
3033+
return static_cast<SPIRVWord>(VersionNumber::SPIRV_1_6);
3034+
return static_cast<SPIRVWord>(VersionNumber::SPIRV_1_0);
3035+
}
30283036
};
30293037

30303038
#define _SPIRV_OP(x, ...) \

‎test/extensions/KHR/SPV_KHR_integer_dot_product/SPV_KHR_integer_dot_product-nonsat.ll‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
; RUN: llvm-as %s -o %t.bc
2-
; RUN: not llvm-spirv %t.bc -spirv-text -o %t.txt 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
2+
; RUN: not llvm-spirv %t.bc -spirv-text --spirv-max-version=1.5 -o %t.txt 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
3+
; RUN: llvm-spirv %t.bc -spirv-text --spirv-max-version=1.5 --spirv-ext=+SPV_KHR_integer_dot_product -o %t.txt
4+
; RUN: FileCheck < %t.txt %s --check-prefixes=CHECK-SPIRV,CHECK-SPIRV-EXT
5+
; RUN: llvm-spirv --spirv-max-version=1.5 --spirv-ext=+SPV_KHR_integer_dot_product %t.bc -o %t.spv
6+
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
7+
; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
8+
39
; RUN: llvm-spirv %t.bc -spirv-text --spirv-ext=+SPV_KHR_integer_dot_product -o %t.txt
4-
; RUN: FileCheck < %t.txt %s --check-prefix=CHECK-SPIRV
10+
; RUN: FileCheck < %t.txt %s --check-prefixes=CHECK-SPIRV,CHECK-SPIRV-NOEXT
511
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_integer_dot_product %t.bc -o %t.spv
612
; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.rev.bc
713
; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
@@ -12,11 +18,17 @@
1218
; CHECK-ERROR: Feature requires the following SPIR-V extension:
1319
; CHECK-ERROR-NEXT: SPV_KHR_integer_dot_product
1420

15-
; CHECK-SPIRV: Capability DotProductInputAllKHR
16-
; CHECK-SPIRV: Capability DotProductInput4x8BitKHR
17-
; CHECK-SPIRV: Capability DotProductInput4x8BitPackedKHR
18-
; CHECK-SPIRV: Capability DotProductKHR
19-
; CHECK-SPIRV: Extension "SPV_KHR_integer_dot_product"
21+
; Check SPIR-V versions in a format magic number + version
22+
; CHECK-SPIRV-EXT: 119734787 65536
23+
; CHECK-SPIRV-NOEXT: 119734787 67072
24+
25+
; CHECK-SPIRV: Int8
26+
; CHECK-SPIRV-DAG: Capability DotProductInput4x8BitKHR
27+
; CHECK-SPIRV-DAG: Capability DotProductInputAllKHR
28+
; CHECK-SPIRV-DAG: Capability DotProductInput4x8BitPackedKHR
29+
; CHECK-SPIRV-DAG: Capability DotProductKHR
30+
; CHECK-SPIRV-EXT: Extension "SPV_KHR_integer_dot_product"
31+
; CHECK-SPIRV-NOEXT-NOT: Extension "SPV_KHR_integer_dot_product"
2032

2133
; CHECK-SPIRV-DAG: TypeInt [[#I8:]] 8
2234
; CHECK-SPIRV-DAG: TypeInt [[#I16:]] 16

‎test/extensions/KHR/SPV_KHR_integer_dot_product/SPV_KHR_integer_dot_product-sat.ll‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
; RUN: llvm-as %s -o %t.bc
2-
; RUN: not llvm-spirv %t.bc -spirv-text -o %t.txt 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
2+
; RUN: not llvm-spirv %t.bc -spirv-text --spirv-max-version=1.5 -o %t.txt 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
3+
; RUN: llvm-spirv %t.bc -spirv-text --spirv-max-version=1.5 --spirv-ext=+SPV_KHR_integer_dot_product -o %t.txt
4+
; RUN: FileCheck < %t.txt %s --check-prefixes=CHECK-SPIRV,CHECK-SPIRV-EXT
5+
; RUN: llvm-spirv --spirv-max-version=1.5 --spirv-ext=+SPV_KHR_integer_dot_product %t.bc -o %t.spv
6+
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
7+
; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
8+
39
; RUN: llvm-spirv %t.bc -spirv-text --spirv-ext=+SPV_KHR_integer_dot_product -o %t.txt
4-
; RUN: FileCheck < %t.txt %s --check-prefix=CHECK-SPIRV
10+
; RUN: FileCheck < %t.txt %s --check-prefixes=CHECK-SPIRV,CHECK-SPIRV-NOEXT
511
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_integer_dot_product %t.bc -o %t.spv
612
; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.rev.bc
713
; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
@@ -12,11 +18,17 @@
1218
; CHECK-ERROR: Feature requires the following SPIR-V extension:
1319
; CHECK-ERROR-NEXT: SPV_KHR_integer_dot_product
1420

15-
; CHECK-SPIRV: Capability DotProductInputAllKHR
16-
; CHECK-SPIRV: Capability DotProductInput4x8BitKHR
17-
; CHECK-SPIRV: Capability DotProductInput4x8BitPackedKHR
18-
; CHECK-SPIRV: Capability DotProductKHR
19-
; CHECK-SPIRV: Extension "SPV_KHR_integer_dot_product"
21+
; Check SPIR-V versions in a format magic number + version
22+
; CHECK-SPIRV-EXT: 119734787 65536
23+
; CHECK-SPIRV-NOEXT: 119734787 67072
24+
25+
; CHECK-SPIRV: Int8
26+
; CHECK-SPIRV-DAG: Capability DotProductInputAllKHR
27+
; CHECK-SPIRV-DAG: Capability DotProductInput4x8BitKHR
28+
; CHECK-SPIRV-DAG: Capability DotProductInput4x8BitPackedKHR
29+
; CHECK-SPIRV-DAG: Capability DotProductKHR
30+
; CHECK-SPIRV-EXT: Extension "SPV_KHR_integer_dot_product"
31+
; CHECK-SPIRV-NOEXT-NOT: Extension "SPV_KHR_integer_dot_product"
2032

2133
; CHECK-SPIRV-DAG: TypeInt [[#I8:]] 8
2234
; CHECK-SPIRV-DAG: TypeInt [[#I16:]] 16

0 commit comments

Comments
 (0)