-
Notifications
You must be signed in to change notification settings - Fork 727
odb: Replace CDL <> (normal and escaped) to [] to match master term name when exporting CDL file. #8433
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
Conversation
|
clang-tidy review says "All clean, LGTM! 👍" |
|
Lint Bazel fails with: But I can't see any error that could cause this in the log. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs a test
src/odb/src/cdl/cdl.cpp
Outdated
| std::replace(token.begin(), token.end(), '<', '['); | ||
| std::replace(token.begin(), token.end(), '>', ']'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what happens if these are escaped? This seems like it would just replace them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you mean by "these"? The < and > chars? So \< and \>?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes you are correct the \< and \>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this escaping exists for CDL? I've never seen it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gadfort is this resolved?
|
You can ignore Lint Bazel for now. |
|
clang-tidy review says "All clean, LGTM! 👍" |
|
Added test and handle escaped chars. |
|
clang-tidy review says "All clean, LGTM! 👍" |
|
The added test is failing with Bazelisk: I don't know anything about bazel. What's the way to fix the failure? |
I just pushed a fix. By default a test can only access <test_name>.* and write_cdl needed access to write_cdl_escaped.cdl |
|
clang-tidy review says "All clean, LGTM! 👍" |
Ok Thanks. Not related to this PR but cts.skip_nets.tcl test is failing in pr-merge. |
|
skip_nets is fixed in master now. I don't see any other failure. |
|
@gadfort Any feedback on this PR? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks fine, but the test needs to be fixed.
src/odb/test/write_cdl.tcl
Outdated
| write_cdl -masters {write_cdl.cdl} results/write_cdl_out.cdl | ||
|
|
||
| write_cdl -masters {write_cdl_escaped.cdl} results/write_cdl_escaped_out.cdl |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this test doesn't actually check anything.
You will need to diff the output file to ensure the output stays valid:
See
| diff_files asap7_macro_notcovered.defok $def_file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. Thanks
…ame when exporting CDL file. Signed-off-by: Christian COSTA <[email protected]>
Signed-off-by: Christian COSTA <[email protected]>
|
Also unrelated test failing: |
|
clang-tidy review says "All clean, LGTM! 👍" |
Issue seen with:
[WARNING ODB-0286] Terminal OP_REG<2> of CDL master NVM_IP not found in LEF.