OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: use the common code for generating extensions and dispatch tables

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4987>
This commit is contained in:
Samuel Pitoiset
2020-05-11 15:08:16 +02:00
parent 857051c5c6
commit ddfae50b67
2 changed files with 14 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
src/intel/vulkan/anv_extensions.py
View File

@@ -24,26 +24,13 @@ COPYRIGHT = """\
*/
"""
import copy
import re
import os.path
import sys
def _bool_to_c_expr(b):
if b is True:
return 'true'
if b is False:
return 'false'
return b
VULKAN_UTIL = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../vulkan/util'))
sys.path.append(VULKAN_UTIL)
class Extension:
def __init__(self, name, ext_version, enable):
self.name = name
self.ext_version = int(ext_version)
self.enable = _bool_to_c_expr(enable)
class ApiVersion:
def __init__(self, version, enable):
self.version = version
self.enable = _bool_to_c_expr(enable)
from vk_extensions import *
API_PATCH_VERSION = 131
@@ -197,142 +184,9 @@ for i in range(len(EXTENSIONS) - 1):
print(EXTENSIONS[i + 1].name + ' should come before ' + EXTENSIONS[i].name)
exit(1)
class VkVersion:
def __init__(self, string):
split = string.split('.')
self.major = int(split[0])
self.minor = int(split[1])
if len(split) > 2:
assert len(split) == 3
self.patch = int(split[2])
else:
self.patch = None
# Sanity check. The range bits are required by the definition of the
# VK_MAKE_VERSION macro
assert self.major < 1024 and self.minor < 1024
assert self.patch is None or self.patch < 4096
assert str(self) == string
def __str__(self):
ver_list = [str(self.major), str(self.minor)]
if self.patch is not None:
ver_list.append(str(self.patch))
return '.'.join(ver_list)
def c_vk_version(self):
patch = self.patch if self.patch is not None else 0
ver_list = [str(self.major), str(self.minor), str(patch)]
return 'VK_MAKE_VERSION(' + ', '.join(ver_list) + ')'
def __int_ver(self):
# This is just an expansion of VK_VERSION
patch = self.patch if self.patch is not None else 0
return (self.major << 22) | (self.minor << 12) | patch
def __gt__(self, other):
# If only one of them has a patch version, "ignore" it by making
# other's patch version match self.
if (self.patch is None) != (other.patch is None):
other = copy.copy(other)
other.patch = self.patch
return self.__int_ver() > other.__int_ver()
MAX_API_VERSION = VkVersion('0.0.0')
for version in API_VERSIONS:
version.version = VkVersion(version.version)
version.version.patch = API_PATCH_VERSION
assert version.version > MAX_API_VERSION
MAX_API_VERSION = version.version
# Mapping between extension name and the android version in which the extension
# was whitelisted in Android CTS.
allowed_android_version = {
# Allowed Instance KHR Extensions
"VK_KHR_surface": 26,
"VK_KHR_display": 26,
"VK_KHR_android_surface": 26,
"VK_KHR_mir_surface": 26,
"VK_KHR_wayland_surface": 26,
"VK_KHR_win32_surface": 26,
"VK_KHR_xcb_surface": 26,
"VK_KHR_xlib_surface": 26,
"VK_KHR_get_physical_device_properties2": 26,
"VK_KHR_get_surface_capabilities2": 26,
"VK_KHR_external_memory_capabilities": 28,
"VK_KHR_external_semaphore_capabilities": 28,
"VK_KHR_external_fence_capabilities": 28,
"VK_KHR_device_group_creation": 28,
"VK_KHR_get_display_properties2": 29,
"VK_KHR_surface_protected_capabilities": 29,
# Allowed Device KHR Extensions
"VK_KHR_swapchain": 26,
"VK_KHR_display_swapchain": 26,
"VK_KHR_sampler_mirror_clamp_to_edge": 26,
"VK_KHR_shader_draw_parameters": 26,
"VK_KHR_shader_float_controls": 29,
"VK_KHR_shader_float16_int8": 29,
"VK_KHR_maintenance1": 26,
"VK_KHR_push_descriptor": 26,
"VK_KHR_descriptor_update_template": 26,
"VK_KHR_incremental_present": 26,
"VK_KHR_shared_presentable_image": 26,
"VK_KHR_storage_buffer_storage_class": 28,
"VK_KHR_8bit_storage": 29,
"VK_KHR_16bit_storage": 28,
"VK_KHR_get_memory_requirements2": 28,
"VK_KHR_external_memory": 28,
"VK_KHR_external_memory_fd": 28,
"VK_KHR_external_memory_win32": 28,
"VK_KHR_external_semaphore": 28,
"VK_KHR_external_semaphore_fd": 28,
"VK_KHR_external_semaphore_win32": 28,
"VK_KHR_external_fence": 28,
"VK_KHR_external_fence_fd": 28,
"VK_KHR_external_fence_win32": 28,
"VK_KHR_win32_keyed_mutex": 28,
"VK_KHR_dedicated_allocation": 28,
"VK_KHR_variable_pointers": 28,
"VK_KHR_relaxed_block_layout": 28,
"VK_KHR_bind_memory2": 28,
"VK_KHR_maintenance2": 28,
"VK_KHR_image_format_list": 28,
"VK_KHR_sampler_ycbcr_conversion": 28,
"VK_KHR_device_group": 28,
"VK_KHR_multiview": 28,
"VK_KHR_maintenance3": 28,
"VK_KHR_draw_indirect_count": 28,
"VK_KHR_create_renderpass2": 28,
"VK_KHR_depth_stencil_resolve": 29,
"VK_KHR_driver_properties": 28,
"VK_KHR_swapchain_mutable_format": 29,
"VK_KHR_shader_atomic_int64": 29,
"VK_KHR_vulkan_memory_model": 29,
"VK_GOOGLE_display_timing": 26,
"VK_ANDROID_native_buffer": 26,
"VK_ANDROID_external_memory_android_hardware_buffer": 28,
}
# Extensions with these prefixes are checked in Android CTS, and thus must be
# whitelisted per the preceding dict.
android_extension_whitelist_prefixes = (
"VK_KHX",
"VK_KHR",
"VK_GOOGLE",
"VK_ANDROID"
)
def get_extension_condition(ext_name, condition):
""" If |ext_name| is an extension that Android CTS cares about, prepend
a condition to ensure that the extension is only enabled for Android
versions in which the extension is whitelisted in CTS. """
if not ext_name.startswith(android_extension_whitelist_prefixes):
return condition
allowed_version = allowed_android_version.get(ext_name, 9999)
return "(!ANDROID || ANDROID_API_LEVEL >= %d) && (%s)" % (allowed_version,
condition)

193
src/intel/vulkan/anv_extensions_gen.py
View File

@@ -24,173 +24,15 @@ COPYRIGHT = """\
*/
"""
import argparse
import xml.etree.cElementTree as et
from mako.template import Template
import os.path
import sys
from anv_extensions import *
platform_defines = []
VULKAN_UTIL = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../vulkan/util'))
sys.path.append(VULKAN_UTIL)
def _init_exts_from_xml(xml):
""" Walk the Vulkan XML and fill out extra extension information. """
xml = et.parse(xml)
ext_name_map = {}
for ext in EXTENSIONS:
ext_name_map[ext.name] = ext
# KHR_display is missing from the list.
platform_defines.append('VK_USE_PLATFORM_DISPLAY_KHR')
for platform in xml.findall('./platforms/platform'):
platform_defines.append(platform.attrib['protect'])
for ext_elem in xml.findall('.extensions/extension'):
ext_name = ext_elem.attrib['name']
if ext_name not in ext_name_map:
continue
ext = ext_name_map[ext_name]
ext.type = ext_elem.attrib['type']
_TEMPLATE_H = Template(COPYRIGHT + """
#ifndef ANV_EXTENSIONS_H
#define ANV_EXTENSIONS_H
#include "stdbool.h"
#include "perf/gen_perf.h"
#define ANV_INSTANCE_EXTENSION_COUNT ${len(instance_extensions)}
extern const VkExtensionProperties anv_instance_extensions[];
struct anv_instance_extension_table {
union {
bool extensions[ANV_INSTANCE_EXTENSION_COUNT];
struct {
%for ext in instance_extensions:
bool ${ext.name[3:]};
%endfor
};
};
};
extern const struct anv_instance_extension_table anv_instance_extensions_supported;
#define ANV_DEVICE_EXTENSION_COUNT ${len(device_extensions)}
extern const VkExtensionProperties anv_device_extensions[];
struct anv_device_extension_table {
union {
bool extensions[ANV_DEVICE_EXTENSION_COUNT];
struct {
%for ext in device_extensions:
bool ${ext.name[3:]};
%endfor
};
};
};
struct anv_physical_device;
void
anv_physical_device_get_supported_extensions(const struct anv_physical_device *device,
struct anv_device_extension_table *extensions);
#endif /* ANV_EXTENSIONS_H */
""")
_TEMPLATE_C = Template(COPYRIGHT + """
#include "anv_private.h"
#include "vk_util.h"
/* Convert the VK_USE_PLATFORM_* defines to booleans */
%for platform_define in platform_defines:
#ifdef ${platform_define}
# undef ${platform_define}
# define ${platform_define} true
#else
# define ${platform_define} false
#endif
%endfor
/* And ANDROID too */
#ifdef ANDROID
# undef ANDROID
# define ANDROID true
#else
# define ANDROID false
# define ANDROID_API_LEVEL 0
#endif
#define ANV_HAS_SURFACE (VK_USE_PLATFORM_WAYLAND_KHR || \\
VK_USE_PLATFORM_XCB_KHR || \\
VK_USE_PLATFORM_XLIB_KHR || \\
VK_USE_PLATFORM_DISPLAY_KHR)
static const uint32_t MAX_API_VERSION = ${MAX_API_VERSION.c_vk_version()};
VkResult anv_EnumerateInstanceVersion(
uint32_t* pApiVersion)
{
*pApiVersion = MAX_API_VERSION;
return VK_SUCCESS;
}
const VkExtensionProperties anv_instance_extensions[ANV_INSTANCE_EXTENSION_COUNT] = {
%for ext in instance_extensions:
{"${ext.name}", ${ext.ext_version}},
%endfor
};
const struct anv_instance_extension_table anv_instance_extensions_supported = {
%for ext in instance_extensions:
.${ext.name[3:]} = ${get_extension_condition(ext.name, ext.enable)},
%endfor
};
uint32_t
anv_physical_device_api_version(struct anv_physical_device *device)
{
uint32_t version = 0;
uint32_t override = vk_get_version_override();
if (override)
return MIN2(override, MAX_API_VERSION);
%for version in API_VERSIONS:
if (!(${version.enable}))
return version;
version = ${version.version.c_vk_version()};
%endfor
return version;
}
const VkExtensionProperties anv_device_extensions[ANV_DEVICE_EXTENSION_COUNT] = {
%for ext in device_extensions:
{"${ext.name}", ${ext.ext_version}},
%endfor
};
void
anv_physical_device_get_supported_extensions(const struct anv_physical_device *device,
struct anv_device_extension_table *extensions)
{
*extensions = (struct anv_device_extension_table) {
%for ext in device_extensions:
.${ext.name[3:]} = ${get_extension_condition(ext.name, ext.enable)},
%endfor
};
}
""")
from vk_extensions_gen import *
if __name__ == '__main__':
parser = argparse.ArgumentParser()
@@ -203,25 +45,8 @@ if __name__ == '__main__':
dest='xml_files')
args = parser.parse_args()
for filename in args.xml_files:
_init_exts_from_xml(filename)
includes = [
"perf/gen_perf.h"
]
for ext in EXTENSIONS:
assert ext.type == 'instance' or ext.type == 'device'
template_env = {
'API_VERSIONS': API_VERSIONS,
'MAX_API_VERSION': MAX_API_VERSION,
'instance_extensions': [e for e in EXTENSIONS if e.type == 'instance'],
'device_extensions': [e for e in EXTENSIONS if e.type == 'device'],
'platform_defines': platform_defines,
'get_extension_condition': get_extension_condition,
}
if args.out_h:
with open(args.out_h, 'w') as f:
f.write(_TEMPLATE_H.render(**template_env))
if args.out_c:
with open(args.out_c, 'w') as f:
f.write(_TEMPLATE_C.render(**template_env))
gen_extensions('anv', args.xml_files, API_VERSIONS, MAX_API_VERSION, EXTENSIONS, args.out_c, args.out_h, includes)