py/qstr: Sort the first QSTR pool.

amirgon · amirgon · commit 311b33c817b0 · 2022-08-14T01:26:09.000+03:00
Signed-off-by: Amir Gonnen &lt;amirgonnen@gmail.com&gt;
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
@@ -52,7 +52,7 @@
 codepoint2name[ord("|")] = "pipe"
 codepoint2name[ord("~")] = "tilde"
 
-# static qstrs, should be sorted
+# static qstrs, unsorted.
 
 static_qstr_list = [
     "",
@@ -89,6 +89,64 @@
     "__repr__",
     "__setitem__",
     "__str__",
+    "__bool__",
+    "__pos__",
+    "__neg__",
+    "__invert__",
+    "__abs__",
+    "__float__",
+    "__complex__",
+    "__sizeof__",
+    "__lt__",
+    "__gt__",
+    "__eq__",
+    "__le__",
+    "__ge__",
+    "__ne__",
+    "__contains__",
+    "__iadd__",
+    "__isub__",
+    "__imul__",
+    "__imatmul__",
+    "__ifloordiv__",
+    "__itruediv__",
+    "__imod__",
+    "__ipow__",
+    "__ior__",
+    "__ixor__",
+    "__iand__",
+    "__ilshift__",
+    "__irshift__",
+    "__add__",
+    "__sub__",
+    "__mul__",
+    "__matmul__",
+    "__floordiv__",
+    "__truediv__",
+    "__mod__",
+    "__divmod__",
+    "__pow__",
+    "__or__",
+    "__xor__",
+    "__and__",
+    "__lshift__",
+    "__rshift__",
+    "__radd__",
+    "__rsub__",
+    "__rmul__",
+    "__rmatmul__",
+    "__rfloordiv__",
+    "__rtruediv__",
+    "__rmod__",
+    "__rpow__",
+    "__ror__",
+    "__rxor__",
+    "__rand__",
+    "__rlshift__",
+    "__rrshift__",
+    "__get__",
+    "__set__",
+    "__delete__",
     "ArithmeticError",
     "AssertionError",
     "AttributeError",
@@ -228,8 +286,6 @@
 ]
 
 # this must match the equivalent function in qstr.c
-
-
 def compute_hash(qstr, bytes_hash):
     hash = 5381
     for b in qstr:
@@ -305,16 +361,6 @@ def parse_input_headers(infiles):
 
                 # add the qstr to the list, with order number to retain original order in file
                 order = len(qstrs)
-                # but put special method names like __add__ at the top of list, so
-                # that their id's fit into a byte
-                if ident == "":
-                    # Sort empty qstr above all still
-                    order = -200000
-                elif ident == "__dir__":
-                    # Put __dir__ after empty qstr for builtin dir() to work
-                    order = -190000
-                elif ident.startswith("__"):
-                    order -= 100000
                 qstrs[ident] = Qstr(order, ident, qstr)
 
     if not qcfgs:
@@ -374,11 +420,11 @@ def print_qstr_data(qstrs):
     q1_values = [q for q in qstrs.values() if q.order >= 0]
 
     # go through each qstr in pool 0 and print it out. pool0 has special sort.
-    for q in sorted(q0_values, key=lambda x: x.order):
+    for q in sorted(q0_values, key=lambda x: x.qhash):
         print('QDEF0(MP_QSTR_%s, %d, %d, "%s")' % (q.ident, q.qhash, q.qlen, q.qdata))
 
     # go through each qstr in pool 1 and print it out. pool1 is regularly sorted.
-    for q in sorted(q1_values, key=lambda x: (x.qhash, x.qlen)):
+    for q in sorted(q1_values, key=lambda x: x.qhash):
         print('QDEF1(MP_QSTR_%s, %d, %d, "%s")' % (q.ident, q.qhash, q.qlen, q.qdata))
 
 
diff --git a/py/qstr.c b/py/qstr.c
@@ -121,7 +121,7 @@ const qstr_pool_t mp_qstr_special_const_pool = {
     MP_QSTRspecial_const_number_of + 1, // corresponds to number of strings in array just below
     (qstr_hash_t *)mp_qstr_const_hashes0,
     (qstr_len_t *)mp_qstr_const_lengths0,
-    false,                       // special constant qstrs are not sorted
+    true,
     {
         #ifndef NO_QSTR
 #define QDEF0(id, hash, len, str) str,
@@ -246,7 +246,7 @@ qstr qstr_find_strn(const char *str, size_t str_len) {
                     high = mid;
                 } else {
                     low = mid;
-                    if (cmp == 0) {
+                    if (MP_UNLIKELY(cmp == 0)) {
                         while (low > 0 && pool->hashes[low - 1] == str_hash) {
                             low--;
                         }
diff --git a/tools/makemanifest.py b/tools/makemanifest.py
@@ -415,7 +415,7 @@ def main():
             b'#include "py/emitglue.h"\n'
             b"extern const qstr_pool_t mp_qstr_const_pool;\n"
             b"const qstr_pool_t mp_qstr_frozen_const_pool = {\n"
-            b"    (qstr_pool_t*)&mp_qstr_const_pool, MP_QSTRnumber_of, 0, false, 0\n"
+            b"    (qstr_pool_t*)&mp_qstr_const_pool, MP_QSTRnumber_of, 0, 0, NULL, NULL, false, NULL\n"
             b"};\n"
             b'const char mp_frozen_names[] = { MP_FROZEN_STR_NAMES "\\0"};\n'
             b"const mp_raw_code_t *const mp_frozen_mpy_content[] = {NULL};\n"
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
@@ -1793,7 +1793,6 @@ def main():
     except MPYReadError as er:
         print(er, file=sys.stderr)
         sys.exit(1)
-        base_qstrs = {}
 
     if args.hexdump:
         hexdump_mpy(compiled_modules)
