enable VK_KHR_cooperative_matrix (Tencent#4823)

* enable VK_KHR_cooperative_matrix * add khr cm shader * update glslang * print matrix info
w8501 · Jul 27, 2023 · c45c01c · c45c01c
1 parent 07b8400
commit c45c01c
Show file tree

Hide file tree

Showing 28 changed files with 4,580 additions and 1,076 deletions.
diff --git a/.ci/test-coverage.yml b/.ci/test-coverage.yml
@@ -52,7 +52,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: swiftshader-install
-        cacheKey: swiftshader-linux-install-20230420
+        cacheKey: swiftshader-linux-install-20230420-1
 
     - name: checkout-swiftshader
       if: steps.cache-swiftshader.outputs.cacheHit != 'true'
@@ -126,7 +126,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: lavapipe-install
-        cacheKey: lavapipe-linux-install-20211127-3
+        cacheKey: lavapipe-linux-install-20211127-4
 
     - name: checkout-lavapipe
       if: steps.cache-lavapipe.outputs.cacheHit != 'true'
@@ -280,7 +280,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: qemu-install
-        cacheKey: qemu-arm-install-20220831
+        cacheKey: qemu-arm-install-20220831-1
 
     - name: checkout-qemu
       if: steps.cache-qemu.outputs.cacheHit != 'true'
@@ -386,7 +386,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: qemu-install
-        cacheKey: qemu-aarch64-install-20220831
+        cacheKey: qemu-aarch64-install-20220831-1
 
     - name: checkout-qemu
       if: steps.cache-qemu.outputs.cacheHit != 'true'
@@ -473,7 +473,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: qemu-install
-        cacheKey: qemu-mipsel-install-20220831
+        cacheKey: qemu-mipsel-install-20220831-1
 
     - name: checkout-qemu
       if: steps.cache-qemu.outputs.cacheHit != 'true'
@@ -552,7 +552,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: qemu-install
-        cacheKey: qemu-mips64el-install-20220831
+        cacheKey: qemu-mips64el-install-20220831-1
 
     - name: checkout-qemu
       if: steps.cache-qemu.outputs.cacheHit != 'true'
@@ -631,7 +631,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: qemu-install
-        cacheKey: qemu-riscv64-install-20230624
+        cacheKey: qemu-riscv64-install-20230624-1
 
     - name: checkout-qemu
       if: steps.cache-qemu.outputs.cacheHit != 'true'
@@ -716,7 +716,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: qemu-install
-        cacheKey: qemu-riscv64-install-20230624
+        cacheKey: qemu-riscv64-install-20230624-1
 
     - name: checkout-qemu
       if: steps.cache-qemu.outputs.cacheHit != 'true'
@@ -751,7 +751,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: rv64gcv-install
-        cacheKey: rv64gcv-linux-install-20221029
+        cacheKey: rv64gcv-linux-install-20221029-1
 
     - name: checkout-riscv-gnu-toolchain
       if: steps.cache-rv64gcv.outputs.cacheHit != 'true'
@@ -861,7 +861,7 @@ jobs:
       uses: cache@1.*
       with:
         cachePaths: qemu-install
-        cacheKey: qemu-loongarch64-install-20230524
+        cacheKey: qemu-loongarch64-install-20230524-1
 
     - name: checkout-qemu
       if: steps.cache-qemu.outputs.cacheHit != 'true'

diff --git a/glslang b/glslang
diff --git a/src/gpu.cpp b/src/gpu.cpp
diff --git a/src/gpu.h b/src/gpu.h
@@ -55,6 +55,9 @@ extern int support_VK_EXT_validation_flags;
 extern int support_VK_KHR_android_surface;
 #endif // __ANDROID_API__ >= 26
 
+// VK_KHR_cooperative_matrix
+extern PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR;
+
 // VK_KHR_external_memory_capabilities
 extern PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR;
 
@@ -176,13 +179,16 @@ class NCNN_EXPORT GpuInfo
     // cooperative matrix feature
     bool support_cooperative_matrix() const;
     bool support_cooperative_matrix_16_8_8() const;
+    bool support_cooperative_matrix_16_8_16() const;
+    bool support_cooperative_matrix_16_16_16() const;
 
     // extension capability
     int support_VK_KHR_8bit_storage() const;
     int support_VK_KHR_16bit_storage() const;
     int support_VK_KHR_bind_memory2() const;
     int support_VK_KHR_buffer_device_address() const;
     int support_VK_KHR_create_renderpass2() const;
+    int support_VK_KHR_cooperative_matrix() const;
     int support_VK_KHR_dedicated_allocation() const;
     int support_VK_KHR_descriptor_update_template() const;
     int support_VK_KHR_external_memory() const;