anv: refresh cached current batch bo after emitting some commands
[mesa.git] / src / intel / vulkan / anv_entrypoints_gen.py
index 23ade58ae19abda0b5bef2c2e5071465691a0bfb..ff166186a0b6a9369a88b5bf6d7173af3d6f7f72 100644 (file)
@@ -25,7 +25,7 @@
 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
@@ -70,6 +70,25 @@ struct anv_instance_dispatch_table {
    };
 };
 
+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)}];
@@ -91,11 +110,14 @@ struct anv_device_dispatch_table {
 
 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
 
 % for e in instance_entrypoints:
-  % if e.alias:
+  % if e.alias and e.alias.enabled:
     <% continue %>
   % endif
   % if e.guard is not None:
@@ -107,7 +129,7 @@ extern const struct anv_device_dispatch_table ${layer}_device_dispatch_table;
   % endif
 % endfor
 
-% for e in device_entrypoints:
+% for e in physical_device_entrypoints:
   % if e.alias:
     <% continue %>
   % endif
@@ -121,6 +143,21 @@ extern const struct anv_device_dispatch_table ${layer}_device_dispatch_table;
 #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"""\
@@ -151,6 +188,8 @@ TEMPLATE_C = Template(u"""\
 
 #include "anv_private.h"
 
+#include "util/macros.h"
+
 struct string_map_entry {
    uint32_t name;
    uint32_t hash;
@@ -217,9 +256,20 @@ ${prefix}_string_map_lookup(const char *str)
 
     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
@@ -228,7 +278,7 @@ ${strmap(device_strmap, 'device')}
  */
 
 % for e in instance_entrypoints:
-  % if e.alias:
+  % if e.alias and e.alias.enabled:
     <% continue %>
   % endif
   % if e.guard is not None:
@@ -252,9 +302,35 @@ const struct anv_instance_dispatch_table anv_instance_dispatch_table = {
 % 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:
@@ -333,6 +409,40 @@ anv_instance_entrypoint_is_enabled(int index, uint32_t core_version,
    }
 }
 
+/** 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.
  *
@@ -373,13 +483,37 @@ anv_get_instance_entrypoint_index(const char *name)
    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;
@@ -422,6 +556,10 @@ anv_lookup_entrypoint(const struct gen_device_info *devinfo, const char *name)
    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);
@@ -499,6 +637,10 @@ class EntrypointBase(object):
         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):
         super(Entrypoint, self).__init__(name)
@@ -506,13 +648,12 @@ class Entrypoint(EntrypointBase):
         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)
 
@@ -524,11 +665,30 @@ class EntrypointAlias(EntrypointBase):
         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)
+
+    @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."""
@@ -633,10 +793,13 @@ def main():
     ]))
 
     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)
 
@@ -646,6 +809,12 @@ def main():
         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)
@@ -657,14 +826,17 @@ def main():
     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: