|
|
@@ -3002,7 +3002,7 @@ static void ggml_vk_load_shaders(vk_device& device) {
|
|
|
if ((device->architecture == AMD_GCN) && (device->driver_id != vk::DriverId::eAmdProprietary)) {
|
|
|
m_warptile_mmq = m_warptile_mmq_int = { 256, 64, 64, 32, 16, 16, 2, 2, 2, 1, 16 };
|
|
|
m_warptile_mmqid = m_warptile_mmqid_int = { 256, 64, 64, 32, 16, 16, 2, 2, 2, 1, 16 };
|
|
|
- } else if (device->vendor_id == VK_VENDOR_ID_AMD && device->coopmat_support) {
|
|
|
+ } else if (device->vendor_id == VK_VENDOR_ID_AMD && device->coopmat_support && device->driver_id != vk::DriverId::eAmdProprietary) {
|
|
|
// This is intentionally using tx_m values, slight performance increase
|
|
|
l_warptile = { 256, 128, 128, 16, subgroup_size_8, 64, 2, tm_m, tn_m, tk_m, subgroup_size_8 };
|
|
|
l_warptile_mmq = l_warptile_mmq_int = { 256, 128, 128, 32, subgroup_size_8, 64, 2, tm_m, tn_m, tk_m, subgroup_size_8 };
|
|
|
@@ -5083,7 +5083,7 @@ static vk_device ggml_vk_get_device(size_t idx) {
|
|
|
switch (device->vendor_id) {
|
|
|
#ifndef GGML_VULKAN_RUN_TESTS
|
|
|
case VK_VENDOR_ID_AMD:
|
|
|
- device->mul_mat_l[i] = device->coopmat_support;
|
|
|
+ device->mul_mat_l[i] = device->coopmat_support && device->driver_id != vk::DriverId::eAmdProprietary;
|
|
|
device->mul_mat_m[i] = true;
|
|
|
device->mul_mat_s[i] = true;
|
|
|
device->mul_mat_id_l[i] = false;
|