radv: Add support for driconf.
[mesa.git] / src / amd / vulkan / radv_device.c
index 433b8542029f0e3202428cb3e015eb1b7a675a3a..f44b6842c2ec9259c32676ec8e2447b5990bd7b4 100644 (file)
@@ -49,6 +49,7 @@
 #include "util/debug.h"
 #include "util/mesa-sha1.h"
 #include "compiler/glsl_types.h"
+#include "util/xmlpool.h"
 
 static int
 radv_device_get_cache_uuid(enum radeon_family family, void *uuid)
@@ -88,7 +89,6 @@ static void
 radv_get_device_name(enum radeon_family family, char *name, size_t name_len)
 {
        const char *chip_string;
-       char llvm_string[32] = {};
 
        switch (family) {
        case CHIP_TAHITI: chip_string = "AMD RADV TAHITI"; break;
@@ -117,10 +117,7 @@ radv_get_device_name(enum radeon_family family, char *name, size_t name_len)
        default: chip_string = "AMD RADV unknown"; break;
        }
 
-       snprintf(llvm_string, sizeof(llvm_string),
-                " (LLVM %i.%i.%i)", (HAVE_LLVM >> 8) & 0xff,
-                HAVE_LLVM & 0xff, MESA_LLVM_VERSION_PATCH);
-       snprintf(name, name_len, "%s%s", chip_string, llvm_string);
+       snprintf(name, name_len, "%s (LLVM " MESA_LLVM_VERSION_STRING ")", chip_string);
 }
 
 static uint64_t
@@ -338,7 +335,7 @@ radv_physical_device_init(struct radv_physical_device *device,
            device->rad_info.chip_class > GFX9)
                fprintf(stderr, "WARNING: radv is not a conformant vulkan implementation, testing use only.\n");
 
-       radv_get_driver_uuid(&device->device_uuid);
+       radv_get_driver_uuid(&device->driver_uuid);
        radv_get_device_uuid(&device->rad_info, &device->device_uuid);
 
        if (device->rad_info.family == CHIP_STONEY ||
@@ -481,6 +478,7 @@ static const struct debug_control radv_perftest_options[] = {
        {"sisched", RADV_PERFTEST_SISCHED},
        {"localbos", RADV_PERFTEST_LOCAL_BOS},
        {"dccmsaa", RADV_PERFTEST_DCC_MSAA},
+       {"bolist", RADV_PERFTEST_BO_LIST},
        {NULL, 0}
 };
 
@@ -523,6 +521,17 @@ static int radv_get_instance_extension_index(const char *name)
        return -1;
 }
 
+static const char radv_dri_options_xml[] =
+DRI_CONF_BEGIN
+DRI_CONF_END;
+
+static void  radv_init_dri_options(struct radv_instance *instance)
+{
+       driParseOptionInfo(&instance->available_dri_options, radv_dri_options_xml);
+       driParseConfigFiles(&instance->dri_options,
+                           &instance->available_dri_options,
+                           0, "radv", NULL);
+}
 
 VkResult radv_CreateInstance(
        const VkInstanceCreateInfo*                 pCreateInfo,
@@ -586,9 +595,11 @@ VkResult radv_CreateInstance(
        }
 
        _mesa_locale_init();
+       glsl_type_singleton_init_or_ref();
 
        VG(VALGRIND_CREATE_MEMPOOL(instance, 0, false));
 
+       radv_init_dri_options(instance);
        radv_handle_per_app_options(instance, pCreateInfo->pApplicationInfo);
 
        *pInstance = radv_instance_to_handle(instance);
@@ -611,9 +622,12 @@ void radv_DestroyInstance(
 
        VG(VALGRIND_DESTROY_MEMPOOL(instance));
 
-       _mesa_glsl_release_types();
+       glsl_type_singleton_decref();
        _mesa_locale_fini();
 
+       driDestroyOptionCache(&instance->dri_options);
+       driDestroyOptionInfo(&instance->available_dri_options);
+
        vk_debug_report_instance_destroy(&instance->debug_report_callbacks);
 
        vk_free(&instance->alloc, instance);
@@ -823,13 +837,13 @@ void radv_GetPhysicalDeviceFeatures2(
                        features->shaderInputAttachmentArrayDynamicIndexing = true;
                        features->shaderUniformTexelBufferArrayDynamicIndexing = true;
                        features->shaderStorageTexelBufferArrayDynamicIndexing = true;
-                       features->shaderUniformBufferArrayNonUniformIndexing = false;
-                       features->shaderSampledImageArrayNonUniformIndexing = false;
-                       features->shaderStorageBufferArrayNonUniformIndexing = false;
-                       features->shaderStorageImageArrayNonUniformIndexing = false;
-                       features->shaderInputAttachmentArrayNonUniformIndexing = false;
-                       features->shaderUniformTexelBufferArrayNonUniformIndexing = false;
-                       features->shaderStorageTexelBufferArrayNonUniformIndexing = false;
+                       features->shaderUniformBufferArrayNonUniformIndexing = true;
+                       features->shaderSampledImageArrayNonUniformIndexing = true;
+                       features->shaderStorageBufferArrayNonUniformIndexing = true;
+                       features->shaderStorageImageArrayNonUniformIndexing = true;
+                       features->shaderInputAttachmentArrayNonUniformIndexing = true;
+                       features->shaderUniformTexelBufferArrayNonUniformIndexing = true;
+                       features->shaderStorageTexelBufferArrayNonUniformIndexing = true;
                        features->descriptorBindingUniformBufferUpdateAfterBind = true;
                        features->descriptorBindingSampledImageUpdateAfterBind = true;
                        features->descriptorBindingStorageImageUpdateAfterBind = true;
@@ -904,6 +918,38 @@ void radv_GetPhysicalDeviceFeatures2(
                        features->storagePushConstant8 = enabled;
                        break;
                }
+               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR: {
+                       VkPhysicalDeviceFloat16Int8FeaturesKHR *features =
+                               (VkPhysicalDeviceFloat16Int8FeaturesKHR*)ext;
+                       features->shaderFloat16 = pdevice->rad_info.chip_class >= VI && HAVE_LLVM >= 0x0800;
+                       features->shaderInt8 = true;
+                       break;
+               }
+               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR: {
+                       VkPhysicalDeviceShaderAtomicInt64FeaturesKHR *features =
+                               (VkPhysicalDeviceShaderAtomicInt64FeaturesKHR *)ext;
+                       /* TODO: Enable this once the driver supports 64-bit
+                        * compare&swap atomic operations.
+                        */
+                       features->shaderBufferInt64Atomics = false;
+                       features->shaderSharedInt64Atomics = false;
+                       break;
+               }
+               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT: {
+                       VkPhysicalDeviceInlineUniformBlockFeaturesEXT *features =
+                               (VkPhysicalDeviceInlineUniformBlockFeaturesEXT *)ext;
+
+                       features->inlineUniformBlock = true;
+                       features->descriptorBindingInlineUniformBlockUpdateAfterBind = true;
+                       break;
+               }
+               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV: {
+                       VkPhysicalDeviceComputeShaderDerivativesFeaturesNV *features =
+                               (VkPhysicalDeviceComputeShaderDerivativesFeaturesNV *)ext;
+                       features->computeDerivativeGroupQuads = false;
+                       features->computeDerivativeGroupLinear = true;
+                       break;
+               }
                default:
                        break;
                }
@@ -1198,7 +1244,8 @@ void radv_GetPhysicalDeviceProperties2(
                        properties->robustBufferAccessUpdateAfterBind = false;
                        properties->quadDivergentImplicitLod = false;
 
-                       size_t max_descriptor_set_size = ((1ull << 31) - 16 * MAX_DYNAMIC_BUFFERS) /
+                       size_t max_descriptor_set_size = ((1ull << 31) - 16 * MAX_DYNAMIC_BUFFERS -
+                               MAX_INLINE_UNIFORM_BLOCK_SIZE * MAX_INLINE_UNIFORM_BLOCK_COUNT) /
                                  (32 /* uniform buffer, 32 due to potential space wasted on alignment */ +
                                   32 /* storage buffer, 32 due to potential space wasted on alignment */ +
                                   32 /* sampler, largest when combined with image */ +
@@ -1261,9 +1308,7 @@ void radv_GetPhysicalDeviceProperties2(
                        memset(driver_props->driverInfo, 0, VK_MAX_DRIVER_INFO_SIZE_KHR);
                        snprintf(driver_props->driverInfo, VK_MAX_DRIVER_INFO_SIZE_KHR,
                                "Mesa " PACKAGE_VERSION MESA_GIT_SHA1
-                               " (LLVM %d.%d.%d)",
-                                (HAVE_LLVM >> 8) & 0xff, HAVE_LLVM & 0xff,
-                                MESA_LLVM_VERSION_PATCH);
+                               " (LLVM " MESA_LLVM_VERSION_STRING ")");
 
                        driver_props->conformanceVersion = (VkConformanceVersionKHR) {
                                .major = 1,
@@ -1288,6 +1333,17 @@ void radv_GetPhysicalDeviceProperties2(
                        properties->transformFeedbackDraw = true;
                        break;
                }
+               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT: {
+                       VkPhysicalDeviceInlineUniformBlockPropertiesEXT *props =
+                               (VkPhysicalDeviceInlineUniformBlockPropertiesEXT *)ext;
+
+                       props->maxInlineUniformBlockSize = MAX_INLINE_UNIFORM_BLOCK_SIZE;
+                       props->maxPerStageDescriptorInlineUniformBlocks = MAX_INLINE_UNIFORM_BLOCK_SIZE * MAX_SETS;
+                       props->maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks = MAX_INLINE_UNIFORM_BLOCK_SIZE * MAX_SETS;
+                       props->maxDescriptorSetInlineUniformBlocks = MAX_INLINE_UNIFORM_BLOCK_COUNT;
+                       props->maxDescriptorSetUpdateAfterBindInlineUniformBlocks = MAX_INLINE_UNIFORM_BLOCK_COUNT;
+                       break;
+               }
                default:
                        break;
                }
@@ -1729,6 +1785,7 @@ VkResult radv_CreateDevice(
         * from the descriptor set anymore, so we have to use a global BO list.
         */
        device->use_global_bo_list =
+               (device->instance->perftest_flags & RADV_PERFTEST_BO_LIST) ||
                device->enabled_extensions.EXT_descriptor_indexing ||
                device->enabled_extensions.EXT_buffer_device_address;
 
@@ -3187,8 +3244,12 @@ static VkResult radv_alloc_memory(struct radv_device *device,
                if (mem_type_index == RADV_MEM_TYPE_GTT_WRITE_COMBINE)
                        flags |= RADEON_FLAG_GTT_WC;
 
-               if (!dedicate_info && !import_info && (!export_info || !export_info->handleTypes))
+               if (!dedicate_info && !import_info && (!export_info || !export_info->handleTypes)) {
                        flags |= RADEON_FLAG_NO_INTERPROCESS_SHARING;
+                       if (device->use_global_bo_list) {
+                               flags |= RADEON_FLAG_PREFER_LOCAL_BO;
+                       }
+               }
 
                mem->bo = device->ws->buffer_create(device->ws, alloc_size, device->physical_device->rad_info.max_alignment,
                                                    domain, flags, priority);