5eb6daf9ed
Pending upstream PR: https://github.com/micropython/micropython/pull/6896 This optimization is important because LVGL creates thousands of qstrs and 'import' can take seconds instead of milliseconds without better qstr search. Currently this PR is pending. Once it is merged or some other optimization that solves this problem is merged, this change could be reverted and replaced by the upstream solution. Today qstr implementation scans strings sequntially. In cases there are many strings this can become very inefficient. This change improves qstr search performance by using binary search in sorted qstr pools, when possible. This change introduces an option to create a sorted string pool, which is then searched by a binary search instead of sequential search. qstr pool can be either "sorted" or "unsorted", whereas the unsorted is searched sequentally as today. Native modules (MP_ROM_QSTR) and frozen modules generate sorted pools. Currently runtime strings are unsorted. The constant string pools is split into two and a new pool is introduced, "special_const_pool". This is required because the first sequence of strings already requires special ordering therefore created unsorted, while the rest of the constants are generated sorted. qstr_find_strn searches strings in each pool. If the pool is sorted and larger than a threshold, it will be search using binary search instead of sequential search, significantly improving performance. (cherry picked from commit 8532c21c663e927d1a9974b75155e57b489a0d1e)
95 lines
3.1 KiB
C
95 lines
3.1 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
#ifndef MICROPY_INCLUDED_PY_QSTR_H
|
|
#define MICROPY_INCLUDED_PY_QSTR_H
|
|
|
|
#include "py/mpconfig.h"
|
|
#include "py/misc.h"
|
|
|
|
// See qstrdefs.h for a list of qstr's that are available as constants.
|
|
// Reference them as MP_QSTR_xxxx.
|
|
//
|
|
// Note: it would be possible to define MP_QSTR_xxx as qstr_from_str("xxx")
|
|
// for qstrs that are referenced this way, but you don't want to have them in ROM.
|
|
|
|
// first entry in enum will be MP_QSTRnull=0, which indicates invalid/no qstr
|
|
enum {
|
|
#ifndef NO_QSTR
|
|
|
|
#define QDEF0(id, str) id,
|
|
#define QDEF1(id, str)
|
|
#include "genhdr/qstrdefs.generated.h"
|
|
#undef QDEF0
|
|
#undef QDEF1
|
|
|
|
MP_QSTRspecial_const_number_of, // no underscore so it can't clash with any of the above
|
|
|
|
#define QDEF0(id, str)
|
|
#define QDEF1(id, str) id,
|
|
#include "genhdr/qstrdefs.generated.h"
|
|
#undef QDEF0
|
|
#undef QDEF1
|
|
|
|
#endif
|
|
MP_QSTRnumber_of, // no underscore so it can't clash with any of the above
|
|
};
|
|
|
|
typedef size_t qstr;
|
|
|
|
typedef struct _qstr_pool_t {
|
|
struct _qstr_pool_t *prev;
|
|
size_t total_prev_len;
|
|
size_t alloc;
|
|
size_t len;
|
|
bool sorted;
|
|
const byte *qstrs[];
|
|
} qstr_pool_t;
|
|
|
|
#define QSTR_TOTAL() (MP_STATE_VM(last_pool)->total_prev_len + MP_STATE_VM(last_pool)->len)
|
|
|
|
void qstr_init(void);
|
|
|
|
mp_uint_t qstr_compute_hash(const byte *data, size_t len);
|
|
qstr qstr_find_strn(const char *str, size_t str_len); // returns MP_QSTRnull if not found
|
|
|
|
qstr qstr_from_str(const char *str);
|
|
qstr qstr_from_strn(const char *str, size_t len);
|
|
|
|
mp_uint_t qstr_hash(qstr q);
|
|
const char *qstr_str(qstr q);
|
|
size_t qstr_len(qstr q);
|
|
const byte *qstr_data(qstr q, size_t *len);
|
|
|
|
void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, size_t *n_total_bytes);
|
|
void qstr_dump_data(void);
|
|
|
|
#if MICROPY_ROM_TEXT_COMPRESSION
|
|
void mp_decompress_rom_string(byte *dst, mp_rom_error_text_t src);
|
|
#define MP_IS_COMPRESSED_ROM_STRING(s) (*(byte *)(s) == 0xff)
|
|
#endif
|
|
|
|
#endif // MICROPY_INCLUDED_PY_QSTR_H
|