-
Notifications
You must be signed in to change notification settings - Fork 7.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(esp_ulp): Add support for multiple ULP program embedding without name collision (IDFGH-14152) #14954
base: master
Are you sure you want to change the base?
Conversation
👋 Hello X-Ryl669, we appreciate your contribution to this project! 📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more. 🖊️ Please also make sure you have read and signed the Contributor License Agreement for this project. Click to see more instructions ...
Review and merge process you can expect ...
|
a0b2fc8
to
5aba452
Compare
@X-Ryl669 Thank you for the PR. We can definitely accept the changes related to customization the prefix ( |
I've reworked the PR to fit the review. I've reverted the linker script removal and instead changed its format so if the declared symbols already exists, it errors out with a meaningful error. This should prevent silent building and runtime crash on colliding name for multiple ULP programs. I've also removed the |
@igrr Can you review the change to see if they fit your requirements, please? |
Thanks for the updates @X-Ryl669. Final changes LGTM. I shall pull in the updates and run it through our CI pipeline. Thanks! |
sha=a71e63e266e25309d96d89e9555f3b6739fd4de6 |
Should I resolve the new conflict with master branch, and if yes, via merging or rebasing? |
I can take care of it :) |
Hi @X-Ryl669,
Thank you for the contribution. |
Ok, thank you very much. About: "Removed the link time symbol name collision detection since it flagged all globals being included from common files across ULP binaries. Primarily, globals defined in the ULP component library." I think that was the point of this PR. I'm probably misunderstanding here what you've done. I have a global log library I'm using in my ULP program. It defines an array of logs ( If included in the main HP core, only one address will be used (likely the first linked, since the linker will just ignore the second one). If your code is trying to read from the buffer, it'll read from the wrong address. If the data read is used to read elsewhere, (like, in my case, when I'm storing a number of argument from the buffer), it'll make your main program crash. So, yes, moving the symbols in their own namespace is one way to prevent this, but since it isn't forced to do so, it'll still cause issues for developers that don't know about the problem. Using the linker to flag that it has already found this symbol makes sure that it can't happen. I've tried this on the multiple ULP program I'm using and it never conflicted wrongly. If it's causing issues, maybe it would be a good idea to warn the user that symbol collision will happen (I think it's possible in CMake to actually check a variable (the last prefix name?) and if set, warn the user about potential collisions, else set it). |
Description
Currently, the ULP's auto variable name embedding script has multiple issues:
This PR fixes it:
nm
cross compilation tool toreadelf
tool for extracting symbols. This allows keeping the symbol's scope (global or local), the symbol type (object or function or ...) and the symbol size (for arrays).ulp_lp_core_lp_ana_peri_intr_handler
ulp_
prefix, but now, you can specify it)ULPmain::
and it'll mangle the name and work withoutextern "C"
): perfect to move the shorter variables in their own namespace and avoid collisions without dumb long namesuint32_t myVariable[32]
is correctly exported so can be used like a native variable in HP core, no more hacky((uint32_t*)myVariable)[0]
like specified in the documentation.From a user perspective, nothing changes (the useless symbol will be removed, but they couldn't be used anyway previously).
However, she can now replace the line:
to this:
And build collision-free and working multiple ULP binary.
Related
Fix #14945 and other issues too related to misusage of ULP symbols in HP core.
Testing
I've tested on my system with ESP32C6. I haven't tested with other CPU types.
However, the tools used in this PR are common cross compilation tools, it shouldn't depend on the CPU architecture.
Checklist
Before submitting a Pull Request, please ensure the following: