Also disable coopmats on amdvlk

0cc4m · 0cc4m · commit 1c4058261076 · 2024-12-12T07:58:19.000Z
diff --git a/ggml/src/ggml-vulkan/ggml-vulkan.cpp b/ggml/src/ggml-vulkan/ggml-vulkan.cpp
@@ -2149,7 +2149,7 @@ static vk_device ggml_vk_get_device(size_t idx) {
 
         device->fp16 = !force_disable_f16 && fp16_storage && fp16_compute;
 
-        if (device->vendor_id == VK_VENDOR_ID_INTEL || (device->vendor_id == VK_VENDOR_ID_AMD && driver_props.driverID == vk::DriverId::eAmdProprietary)) {
+        if (device->vendor_id == VK_VENDOR_ID_INTEL || (device->vendor_id == VK_VENDOR_ID_AMD && (driver_props.driverID == vk::DriverId::eAmdProprietary || driver_props.driverID == vk::DriverId::eAmdOpenSource))) {
             // Intel drivers don't support coopmat properly yet
             // Only RADV supports coopmat properly on AMD
             device->coopmat_support = false;
@@ -2536,7 +2536,7 @@ static void ggml_vk_print_gpu_info(size_t idx) {
         }
     }
 
-    if (props2.properties.vendorID == VK_VENDOR_ID_INTEL || (props2.properties.vendorID == VK_VENDOR_ID_AMD && driver_props.driverID == vk::DriverId::eAmdProprietary)) {
+    if (props2.properties.vendorID == VK_VENDOR_ID_INTEL || (props2.properties.vendorID == VK_VENDOR_ID_AMD && (driver_props.driverID == vk::DriverId::eAmdProprietary || driver_props.driverID == vk::DriverId::eAmdOpenSource))) {
         // Intel drivers don't support coopmat properly yet
         // Only RADV supports coopmat properly on AMD
         coopmat_support = false;

Original file line number	Diff line number	Diff line change
`@@ -2149,7 +2149,7 @@ static vk_device ggml_vk_get_device(size_t idx) {`
`2149`	`2149`
`2150`	`2150`	`device->fp16 = !force_disable_f16 && fp16_storage && fp16_compute;`
`2151`	`2151`
`2152`		`- if (device->vendor_id == VK_VENDOR_ID_INTEL \|\| (device->vendor_id == VK_VENDOR_ID_AMD && driver_props.driverID == vk::DriverId::eAmdProprietary)) {`
	`2152`	`+ if (device->vendor_id == VK_VENDOR_ID_INTEL \|\| (device->vendor_id == VK_VENDOR_ID_AMD && (driver_props.driverID == vk::DriverId::eAmdProprietary \|\| driver_props.driverID == vk::DriverId::eAmdOpenSource))) {`
`2153`	`2153`	`// Intel drivers don't support coopmat properly yet`
`2154`	`2154`	`// Only RADV supports coopmat properly on AMD`
`2155`	`2155`	`device->coopmat_support = false;`
`@@ -2536,7 +2536,7 @@ static void ggml_vk_print_gpu_info(size_t idx) {`
`2536`	`2536`	`}`
`2537`	`2537`	`}`
`2538`	`2538`
`2539`		`- if (props2.properties.vendorID == VK_VENDOR_ID_INTEL \|\| (props2.properties.vendorID == VK_VENDOR_ID_AMD && driver_props.driverID == vk::DriverId::eAmdProprietary)) {`
	`2539`	`+ if (props2.properties.vendorID == VK_VENDOR_ID_INTEL \|\| (props2.properties.vendorID == VK_VENDOR_ID_AMD && (driver_props.driverID == vk::DriverId::eAmdProprietary \|\| driver_props.driverID == vk::DriverId::eAmdOpenSource))) {`
`2540`	`2540`	`// Intel drivers don't support coopmat properly yet`
`2541`	`2541`	`// Only RADV supports coopmat properly on AMD`
`2542`	`2542`	`coopmat_support = false;`