py/persistentcode: Introduce .mpy sub-version. #9341
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dpgeorge
reviewed
Sep 19, 2022
jimmo
force-pushed
the
mpy-sub-version
branch
from
187e010 to
6e8dd09
Compare
Member
|
The --- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1658,7 +1658,9 @@ def merge_mpy(compiled_modules, output_file):
else:
main_cm_idx = None
for idx, cm in enumerate(compiled_modules):
- if cm.header[2]:
+ feature_byte = cm.header[2]
+ mpy_native_arch = feature_byte >> 2
+ if mpy_native_arch:
# Must use qstr_table and obj_table from this raw_code
if main_cm_idx is not None:
raise Exception("can't merge files when more than one contains native code") |
The intent is to allow us to make breaking changes to the native ABI (e.g. changes to dynruntime.h) without needing the bytecode version to increment. With this commit the two bits previously used for the feature flags (but now unused as of .mpy version 6) encode a sub-version. A bytecode-only .mpy file can be loaded as long as MPY_VERSION matches, but a native .mpy (i.e. one with an arch set) must also match MPY_SUB_VERSION. This allows 3 additional updates to the native ABI per bytecode revision. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
jimmo
force-pushed
the
mpy-sub-version
branch
from
6e8dd09 to
9311027
Compare
Member
Author
Thanks. In a future PR we should make mpy-tool.py and mpy_ld.py use helpers to access these bytes (like persistentcode.c does). |
Member
|
I've updated the tests and docs. |
Member
|
Merged in d94141e with changes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an alternative to #9303.
The intent is to allow us to make breaking changes to the native ABI (e.g. changes to dynruntime.h) without needing the bytecode version to increment.
With this commit the two bits previously used for the feature flags (but now unused as of .mpy version 6) encode a sub-version. A bytecode-only .mpy file can be loaded as long as
MPY_VERSIONmatches, but a native .mpy (i.e. one with an arch set) must also matchMPY_SUB_VERSION. This allows 3 additional updates to the native ABI per bytecode revision.This work was funded through GitHub Sponsors.