Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support disabling blocks containing forks #6514

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.

Sign up for GitHub

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

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
+294 −77
Draft

Support disabling blocks containing forks #6514

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fa6c0c5
Add tests
RRozak Sep 25, 2025
8f0b432
Distinguish if block is inside fork or if contains it
RRozak Sep 25, 2025
2ca4fac
Swap order of warnings
RRozak Sep 26, 2025
e052226
Apply 'make format'
Sep 26, 2025
3d3f9ce
Fix setting CIF_INSIDE
RRozak Sep 26, 2025
cc42489
Throw error when block is inside function
RRozak Sep 26, 2025
c61420e
Remove test where disable is outside fork
RRozak Sep 26, 2025
f53370d
Add implementation of disableForkQueue
RRozak Sep 26, 2025
47815cd
Utilize handleDisableOnFork and make it taking method name as argument
RRozak Sep 29, 2025
6d0754e
Update comments
RRozak Sep 29, 2025
563b654
Remove redundant if
RRozak Sep 29, 2025
873ead6
Use else if
RRozak Sep 29, 2025
75aa78e
Format test
RRozak Sep 29, 2025
bcf9039
Update test output
RRozak Sep 29, 2025
5696d82
Expect pass in t_disable test
RRozak Sep 29, 2025
b6282b0
Add test of warning
RRozak Sep 29, 2025
b8e6fcb
Change name
RRozak Sep 30, 2025
d9ce454
Add test with task
RRozak Sep 29, 2025
4d282a4
Merge cases
RRozak Sep 29, 2025
31d90b7
Throw UNSUPPORTED when block is inside function/task
RRozak Sep 30, 2025
817cde4
Apply 'make format'
Sep 30, 2025
23bc9f6
Use old way when no forks are present
RRozak Sep 30, 2025
58f23a9
Fix typo
RRozak Sep 30, 2025
c8cb4a6
Update json output
RRozak Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Utilize handleDisableOnFork and make it taking method name as argument 
Signed-off-by: Ryszard Rozak <[email protected]>
  • Loading branch information
@RRozak
RRozak committed Oct 7, 2025
commit 47815cd30b5beecb3e4b5354759dbbfdf9c04c49
11 changes: 7 additions & 4 deletions src/V3LinkJump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ class LinkJumpVisitor final : public VNVisitor {
return new AstStmtExpr{
fl, new AstMethodCall{fl, queueRefp, "push_back", new AstArg{fl, "", processSelfp}}};
}
void handleDisableOnFork(AstDisable* const nodep, const std::vector<AstBegin*>& forks) {
void handleDisableOnFork(AstDisable* const nodep, const std::vector<AstBegin*>& forks,
const std::string& methodName) {
// The support utilizes the process::kill()` method. For each `disable` a queue of
// processes is declared. At the beginning of each fork that can be disabled, its process
// handle is pushed to the queue. `disable` statement is replaced with calling `kill()`
Expand Down Expand Up @@ -217,7 +218,7 @@ class LinkJumpVisitor final : public VNVisitor {
}
AstVarRef* const queueRefp = new AstVarRef{fl, topPkgp, processQueuep, VAccess::READWRITE};
AstTaskRef* const killQueueCall
= new AstTaskRef{fl, VN_AS(getMemberp(processClassp, "killQueue"), Task),
= new AstTaskRef{fl, VN_AS(getMemberp(processClassp, methodName), Task),
new AstArg{fl, "", queueRefp}};
killQueueCall->classOrPackagep(processClassp);
AstStmtExpr* const killStmtp = new AstStmtExpr{fl, killQueueCall};
Expand Down Expand Up @@ -413,18 +414,20 @@ class LinkJumpVisitor final : public VNVisitor {
}
forks.push_back(beginp);
}
handleDisableOnFork(nodep, forks);
handleDisableOnFork(nodep, forks, "killQueue");
} else if (AstBegin* const beginp = VN_CAST(targetp, Begin)) {
if (directlyUnderFork(beginp)) {
std::vector<AstBegin*> forks{beginp};
handleDisableOnFork(nodep, forks);
handleDisableOnFork(nodep, forks, "killQueue");
} else {
const std::string targetName = beginp->name();
if (existsBlockAbove(targetName)) {
if (beginp->user3() & CIF_INSIDE) {
nodep->v3warn(E_UNSUPPORTED, "Unsupported: disabling block inside a fork");
}
if (beginp->user3() & CIF_CONTAINS) {
std::vector<AstBegin*> blocks{beginp};
handleDisableOnFork(nodep, blocks, "disableForkQueue");
if (m_ftaskp) {
nodep->v3warn(E_UNSUPPORTED,
"Unsupported: disabling block that is inside task / "
Expand Down