import argparse
import math
import os
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
from collections import OrderedDict, namedtuple
from mako.template import Template
'gen9',
'gen10',
'gen11',
+ 'gen12',
]
TEMPLATE_H = Template("""\
};
};
+struct anv_physical_device_dispatch_table {
+ union {
+ void *entrypoints[${len(physical_device_entrypoints)}];
+ struct {
+ % for e in physical_device_entrypoints:
+ % if e.guard is not None:
+#ifdef ${e.guard}
+ PFN_${e.name} ${e.name};
+#else
+ void *${e.name};
+# endif
+ % else:
+ PFN_${e.name} ${e.name};
+ % endif
+ % endfor
+ };
+ };
+};
+
struct anv_device_dispatch_table {
union {
void *entrypoints[${len(device_entrypoints)}];
extern const struct anv_instance_dispatch_table anv_instance_dispatch_table;
%for layer in LAYERS:
+extern const struct anv_physical_device_dispatch_table ${layer}_physical_device_dispatch_table;
+%endfor
+%for layer in LAYERS:
extern const struct anv_device_dispatch_table ${layer}_device_dispatch_table;
%endfor
-extern const struct anv_device_dispatch_table anv_tramp_device_dispatch_table;
% for e in instance_entrypoints:
- % if e.alias:
+ % if e.alias and e.alias.enabled:
<% continue %>
% endif
% if e.guard is not None:
% endif
% endfor
-% for e in device_entrypoints:
+% for e in physical_device_entrypoints:
% if e.alias:
<% continue %>
% endif
#endif // ${e.guard}
% endif
% endfor
+
+% for e in device_entrypoints:
+ % if e.alias and e.alias.enabled:
+ <% continue %>
+ % endif
+ % if e.guard is not None:
+#ifdef ${e.guard}
+ % endif
+ % for layer in LAYERS:
+ ${e.return_type} ${e.prefixed_name(layer)}(${e.decl_params()});
+ % endfor
+ % if e.guard is not None:
+#endif // ${e.guard}
+ % endif
+% endfor
""", output_encoding='utf-8')
TEMPLATE_C = Template(u"""\
#include "anv_private.h"
+#include "util/macros.h"
+
struct string_map_entry {
uint32_t name;
uint32_t hash;
return -1;
}
+
+static const char *
+${prefix}_entry_name(int num)
+{
+ for (int i = 0; i < ARRAY_SIZE(${prefix}_string_map_entries); i++) {
+ if (${prefix}_string_map_entries[i].num == num)
+ return &${prefix}_strings[${prefix}_string_map_entries[i].name];
+ }
+ return NULL;
+}
</%def>
${strmap(instance_strmap, 'instance')}
+${strmap(physical_device_strmap, 'physical_device')}
${strmap(device_strmap, 'device')}
/* Weak aliases for all potential implementations. These will resolve to
*/
% for e in instance_entrypoints:
- % if e.alias:
+ % if e.alias and e.alias.enabled:
<% continue %>
% endif
% if e.guard is not None:
% endfor
};
+% for e in physical_device_entrypoints:
+ % if e.alias and e.alias.enabled:
+ <% continue %>
+ % endif
+ % if e.guard is not None:
+#ifdef ${e.guard}
+ % endif
+ ${e.return_type} ${e.prefixed_name('anv')}(${e.decl_params()}) __attribute__ ((weak));
+ % if e.guard is not None:
+#endif // ${e.guard}
+ % endif
+% endfor
+
+const struct anv_physical_device_dispatch_table anv_physical_device_dispatch_table = {
+% for e in physical_device_entrypoints:
+ % if e.guard is not None:
+#ifdef ${e.guard}
+ % endif
+ .${e.name} = ${e.prefixed_name('anv')},
+ % if e.guard is not None:
+#endif // ${e.guard}
+ % endif
+% endfor
+};
+
+
% for layer in LAYERS:
% for e in device_entrypoints:
- % if e.alias:
+ % if e.alias and e.alias.enabled:
<% continue %>
% endif
% if e.guard is not None:
#ifdef ${e.guard}
% endif
- ${e.return_type} ${e.prefixed_name(layer)}(${e.decl_params()}) __attribute__ ((weak));
+ % if layer == 'anv':
+ ${e.return_type} __attribute__ ((weak))
+ ${e.prefixed_name('anv')}(${e.decl_params()})
+ {
+ % if e.params[0].type == 'VkDevice':
+ ANV_FROM_HANDLE(anv_device, anv_device, ${e.params[0].name});
+ return anv_device->dispatch.${e.name}(${e.call_params()});
+ % elif e.params[0].type == 'VkCommandBuffer':
+ ANV_FROM_HANDLE(anv_cmd_buffer, anv_cmd_buffer, ${e.params[0].name});
+ return anv_cmd_buffer->device->dispatch.${e.name}(${e.call_params()});
+ % elif e.params[0].type == 'VkQueue':
+ ANV_FROM_HANDLE(anv_queue, anv_queue, ${e.params[0].name});
+ return anv_queue->device->dispatch.${e.name}(${e.call_params()});
+ % else:
+ assert(!"Unhandled device child trampoline case: ${e.params[0].type}");
+ % endif
+ }
+ % else:
+ ${e.return_type} ${e.prefixed_name(layer)}(${e.decl_params()}) __attribute__ ((weak));
+ % endif
% if e.guard is not None:
#endif // ${e.guard}
% endif
% endfor
-/** Trampoline entrypoints for all device functions */
-
-% for e in device_entrypoints:
- % if e.alias:
- <% continue %>
- % endif
- % if e.guard is not None:
-#ifdef ${e.guard}
- % endif
- static ${e.return_type}
- ${e.prefixed_name('anv_tramp')}(${e.decl_params()})
- {
- % if e.params[0].type == 'VkDevice':
- ANV_FROM_HANDLE(anv_device, anv_device, ${e.params[0].name});
- return anv_device->dispatch.${e.name}(${e.call_params()});
- % elif e.params[0].type == 'VkCommandBuffer':
- ANV_FROM_HANDLE(anv_cmd_buffer, anv_cmd_buffer, ${e.params[0].name});
- return anv_cmd_buffer->device->dispatch.${e.name}(${e.call_params()});
- % elif e.params[0].type == 'VkQueue':
- ANV_FROM_HANDLE(anv_queue, anv_queue, ${e.params[0].name});
- return anv_queue->device->dispatch.${e.name}(${e.call_params()});
- % else:
- assert(!"Unhandled device child trampoline case: ${e.params[0].type}");
- % endif
- }
- % if e.guard is not None:
-#endif // ${e.guard}
- % endif
-% endfor
-
-const struct anv_device_dispatch_table anv_tramp_device_dispatch_table = {
-% for e in device_entrypoints:
- % if e.guard is not None:
-#ifdef ${e.guard}
- % endif
- .${e.name} = ${e.prefixed_name('anv_tramp')},
- % if e.guard is not None:
-#endif // ${e.guard}
- % endif
-% endfor
-};
-
-
/** Return true if the core version or extension in which the given entrypoint
* is defined is enabled.
*
}
}
+/** Return true if the core version or extension in which the given entrypoint
+ * is defined is enabled.
+ *
+ * If device is NULL, all device extensions are considered enabled.
+ */
+bool
+anv_physical_device_entrypoint_is_enabled(int index, uint32_t core_version,
+ const struct anv_instance_extension_table *instance)
+{
+ switch (index) {
+% for e in physical_device_entrypoints:
+ case ${e.num}:
+ /* ${e.name} */
+ % if e.core_version:
+ return ${e.core_version.c_vk_version()} <= core_version;
+ % elif e.extensions:
+ % for ext in e.extensions:
+ % if ext.type == 'instance':
+ if (instance->${ext.name[3:]}) return true;
+ % else:
+ /* All device extensions are considered enabled at the instance level */
+ return true;
+ % endif
+ % endfor
+ return false;
+ % else:
+ return true;
+ % endif
+% endfor
+ default:
+ return false;
+ }
+}
+
/** Return true if the core version or extension in which the given entrypoint
* is defined is enabled.
*
return instance_string_map_lookup(name);
}
+int
+anv_get_physical_device_entrypoint_index(const char *name)
+{
+ return physical_device_string_map_lookup(name);
+}
+
int
anv_get_device_entrypoint_index(const char *name)
{
return device_string_map_lookup(name);
}
-static void * __attribute__ ((noinline))
+const char *
+anv_get_instance_entry_name(int index)
+{
+ return instance_entry_name(index);
+}
+
+const char *
+anv_get_physical_device_entry_name(int index)
+{
+ return physical_device_entry_name(index);
+}
+
+const char *
+anv_get_device_entry_name(int index)
+{
+ return device_entry_name(index);
+}
+
+void * __attribute__ ((noinline))
anv_resolve_device_entrypoint(const struct gen_device_info *devinfo, uint32_t index)
{
const struct anv_device_dispatch_table *genX_table;
switch (devinfo->gen) {
+ case 12:
+ genX_table = &gen12_device_dispatch_table;
+ break;
case 11:
genX_table = &gen11_device_dispatch_table;
break;
if (idx >= 0)
return anv_instance_dispatch_table.entrypoints[idx];
+ idx = anv_get_physical_device_entrypoint_index(name);
+ if (idx >= 0)
+ return anv_physical_device_dispatch_table.entrypoints[idx];
+
idx = anv_get_device_entrypoint_index(name);
if (idx >= 0)
return anv_resolve_device_entrypoint(devinfo, idx);
def add_string(self, string, num):
assert not self.baked
assert string not in self.strings
- assert num >= 0 and num < 2**31
+ assert 0 <= num < 2**31
self.strings[string] = StringIntMapEntry(string, num)
def bake(self):
self.core_version = None
self.extensions = []
+ def prefixed_name(self, prefix):
+ assert self.name.startswith('vk')
+ return prefix + '_' + self.name[2:]
+
class Entrypoint(EntrypointBase):
- def __init__(self, name, return_type, params, guard = None):
+ def __init__(self, name, return_type, params, guard=None):
super(Entrypoint, self).__init__(name)
self.return_type = return_type
self.params = params
self.guard = guard
+ def is_physical_device_entrypoint(self):
+ return self.params[0].type in ('VkPhysicalDevice', )
+
def is_device_entrypoint(self):
return self.params[0].type in ('VkDevice', 'VkCommandBuffer', 'VkQueue')
- def prefixed_name(self, prefix):
- assert self.name.startswith('vk')
- return prefix + '_' + self.name[2:]
-
def decl_params(self):
return ', '.join(p.decl for p in self.params)
super(EntrypointAlias, self).__init__(name)
self.alias = entrypoint
+ def is_physical_device_entrypoint(self):
+ return self.alias.is_physical_device_entrypoint()
+
def is_device_entrypoint(self):
return self.alias.is_device_entrypoint()
def prefixed_name(self, prefix):
- return self.alias.prefixed_name(prefix)
+ if self.alias.enabled:
+ return self.alias.prefixed_name(prefix)
+ return super(EntrypointAlias, self).prefixed_name(prefix)
-def get_entrypoints(doc, entrypoints_to_defines, start_index):
+ @property
+ def params(self):
+ return self.alias.params
+
+ @property
+ def return_type(self):
+ return self.alias.return_type
+
+ def decl_params(self):
+ return self.alias.decl_params()
+
+ def call_params(self):
+ return self.alias.call_params()
+
+def get_entrypoints(doc, entrypoints_to_defines):
"""Extract the entry points from the registry."""
entrypoints = OrderedDict()
name = command.find('./proto/name').text
ret_type = command.find('./proto/type').text
params = [EntrypointParam(
- type = p.find('./type').text,
- name = p.find('./name').text,
- decl = ''.join(p.itertext())
+ type=p.find('./type').text,
+ name=p.find('./name').text,
+ decl=''.join(p.itertext())
) for p in command.findall('./param')]
guard = entrypoints_to_defines.get(name)
# They really need to be unique
"""Maps entry points to extension defines."""
entrypoints_to_defines = {}
+ platform_define = {}
+ for platform in doc.findall('./platforms/platform'):
+ name = platform.attrib['name']
+ define = platform.attrib['protect']
+ platform_define[name] = define
+
for extension in doc.findall('./extensions/extension[@platform]'):
platform = extension.attrib['platform']
- ext = '_KHR'
- if platform.upper() == 'XLIB_XRANDR':
- ext = '_EXT'
- define = 'VK_USE_PLATFORM_' + platform.upper() + ext
+ define = platform_define[platform]
for entrypoint in extension.findall('./require/command'):
fullname = entrypoint.attrib['name']
for filename in args.xml_files:
doc = et.parse(filename)
- entrypoints += get_entrypoints(doc, get_entrypoints_defines(doc),
- start_index=len(entrypoints))
+ entrypoints += get_entrypoints(doc, get_entrypoints_defines(doc))
# Manually add CreateDmaBufImageINTEL for which we don't have an extension
# defined.
]))
device_entrypoints = []
+ physical_device_entrypoints = []
instance_entrypoints = []
for e in entrypoints:
if e.is_device_entrypoint():
device_entrypoints.append(e)
+ elif e.is_physical_device_entrypoint():
+ physical_device_entrypoints.append(e)
else:
instance_entrypoints.append(e)
e.num = num
device_strmap.bake()
+ physical_device_strmap = StringIntMap()
+ for num, e in enumerate(physical_device_entrypoints):
+ physical_device_strmap.add_string(e.name, num)
+ e.num = num
+ physical_device_strmap.bake()
+
instance_strmap = StringIntMap()
for num, e in enumerate(instance_entrypoints):
instance_strmap.add_string(e.name, num)
try:
with open(os.path.join(args.outdir, 'anv_entrypoints.h'), 'wb') as f:
f.write(TEMPLATE_H.render(instance_entrypoints=instance_entrypoints,
+ physical_device_entrypoints=physical_device_entrypoints,
device_entrypoints=device_entrypoints,
LAYERS=LAYERS,
filename=os.path.basename(__file__)))
with open(os.path.join(args.outdir, 'anv_entrypoints.c'), 'wb') as f:
f.write(TEMPLATE_C.render(instance_entrypoints=instance_entrypoints,
+ physical_device_entrypoints=physical_device_entrypoints,
device_entrypoints=device_entrypoints,
LAYERS=LAYERS,
instance_strmap=instance_strmap,
+ physical_device_strmap=physical_device_strmap,
device_strmap=device_strmap,
filename=os.path.basename(__file__)))
except Exception:
- # In the even there's an error this imports some helpers from mako
+ # In the event there's an error, this imports some helpers from mako
# to print a useful stack trace and prints it, then exits with
# status 1, if python is run with debug; otherwise it just raises
# the exception
projects / mesa.git / blobdiff