Skip to content

[TableGen] Added submulticlass typechecking to template arg values. #112904

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[TableGen] Added submulticlass typechecking to template arg values. #112904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24da282
[TableGen] Added submulticlass typechecking to template arg values.
jofrn Oct 18, 2024
8872da7
Give _fake16 record a vOPDName so that it now has a suffix in VOPDName.
jofrn Oct 20, 2024
9fcd0c4
Add line number to assertion
jofrn Oct 20, 2024
b0a59fb
Change vOPDName to be prefix that is ignored by !substr in fake record.
jofrn Oct 21, 2024
d3e9c88
Add let !eq in submulticlass test.
jofrn Oct 22, 2024
4a20034
Remove prefix in fake record and rebase to b3acb25.
jofrn Oct 22, 2024
ae9da08
Use the more derived type
jofrn Oct 22, 2024
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
6 changes: 6 additions & 0 deletions llvm/lib/TableGen/TGParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,12 @@ ParseSubMultiClassReference(MultiClass *CurMC) {
return Result;
}

if (CheckTemplateArgValues(Result.TemplateArgs, Result.RefRange.Start,
&Result.MC->Rec)) {
Result.MC = nullptr; // Error checking value list.
return Result;
}

Result.RefRange.End = Lex.getLoc();

return Result;
Expand Down
21 changes: 21 additions & 0 deletions llvm/test/TableGen/submulticlass-leteq.td
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// RUN: llvm-tblgen %s | FileCheck %s
// XFAIL: vg_leak
// CHECK: def X0 { // C
// CHECK-NEXT: bit x = 1;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bit x = 0; in the before case, yet !cast<bits<8>>(-1) is identical to Val.

// CHECK-NEXT: }
// CHECK-NEXT: def X1 { // C
// CHECK-NEXT: bit x = 0;
// CHECK-NEXT: }
class C {
bit x;
}
multiclass M0<bits<8> Val> {
let x = !eq(Val, !cast<bits<8>>(-1)) in def NAME : C;
}
multiclass M1<bits<8> Val> {
let x = !eq(Val, -1) in def NAME : C;
Copy link
Contributor Author

@jofrn jofrn Oct 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should evaluate to bit x = 0 because -1 is an integer and Val is 255.

}
multiclass M2_0 : M0<-1>;
multiclass M2_1 : M1<-1>;
defm X0 : M2_0;
defm X1 : M2_1;
12 changes: 12 additions & 0 deletions llvm/test/TableGen/submulticlass-typecheck.td
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// RUN: not llvm-tblgen %s 2>&1 | FileCheck %s
// XFAIL: vg_leak
// CHECK: {{.*}}:11:28: error: Value specified for template argument 'B::op' is of type bits<4>; expected type bits<8>: C::op
// CHECK-NEXT: multiclass C<bits<4> op> : B<op>;
class A<bits<8> op> {
bits<8> f = op;
}
multiclass B<bits<8> op> {
def : A<op>;
}
multiclass C<bits<4> op> : B<op>;
defm D : C<0>;
Loading