[Intrinsic] Unify IIT_STRUCT{2-9} into ITT_STRUCT to support upto 257 return value #160434
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
|
@llvm/pr-subscribers-tablegen Author: None (darkbuck) Changes
Full diff: https://github.com/llvm/llvm-project/pull/160434.diff 4 Files Affected:
diff --git a/llvm/include/llvm/IR/Intrinsics.td b/llvm/include/llvm/IR/Intrinsics.td
index 585371a6a4423..541f1bccdfe1a 100644
--- a/llvm/include/llvm/IR/Intrinsics.td
+++ b/llvm/include/llvm/IR/Intrinsics.td
@@ -337,6 +337,7 @@ def IIT_V6 : IIT_Vec<6, 60>;
def IIT_V10 : IIT_Vec<10, 61>;
def IIT_V2048 : IIT_Vec<2048, 62>;
def IIT_V4096 : IIT_Vec<4096, 63>;
+def IIT_STRUCTn : IIT_Base<64>;
}
defvar IIT_all_FixedTypes = !filter(iit, IIT_all,
@@ -663,7 +664,9 @@ class TypeInfoGen<
!if(!isa<LLVMMatchType>(ty), ACTys[MappingRIdxs[ty.Number]], ty));
list<int> TypeSig = !listflatten(!listconcat(
- [IIT_RetNumbers[!size(RetTypes)]],
+ [!cond(
+ !lt(!size(RetTypes), !size(IIT_RetNumbers)): IIT_RetNumbers[!size(RetTypes)],
+ true: [IIT_STRUCTn.Number, !sub(!size(RetTypes), !size(IIT_RetNumbers))])],
!foreach(i, !range(AllTypes),
!foreach(a, AllTypes[i].Sig,
ResolveArgCode<
diff --git a/llvm/lib/IR/Intrinsics.cpp b/llvm/lib/IR/Intrinsics.cpp
index 4d2e8fadff4f7..7298141f8b695 100644
--- a/llvm/lib/IR/Intrinsics.cpp
+++ b/llvm/lib/IR/Intrinsics.cpp
@@ -390,6 +390,9 @@ DecodeIITType(unsigned &NextElt, ArrayRef<unsigned char> Infos,
case IIT_EMPTYSTRUCT:
OutputTable.push_back(IITDescriptor::get(IITDescriptor::Struct, 0));
return;
+ case IIT_STRUCTn:
+ StructElts += Infos[NextElt++] + 1;
+ [[fallthrough]];
case IIT_STRUCT9:
++StructElts;
[[fallthrough]];
diff --git a/llvm/test/TableGen/intrinsic-struct.td b/llvm/test/TableGen/intrinsic-struct.td
index 467fd9057c183..c5ee2c3087ca2 100644
--- a/llvm/test/TableGen/intrinsic-struct.td
+++ b/llvm/test/TableGen/intrinsic-struct.td
@@ -1,22 +1,41 @@
// RUN: llvm-tblgen -gen-intrinsic-enums -I %p/../../include %s -DTEST_INTRINSICS_SUPPRESS_DEFS | FileCheck %s --check-prefix=CHECK-ENUM
-// RUN: llvm-tblgen -gen-intrinsic-impl -I %p/../../include %s -DTEST_INTRINSICS_SUPPRESS_DEFS > /dev/null 2>&1
+// RUN: llvm-tblgen -gen-intrinsic-impl -I %p/../../include %s -DTEST_INTRINSICS_SUPPRESS_DEFS | FileCheck %s --check-prefix=CHECK-IMPL
// RUN: not llvm-tblgen -gen-intrinsic-impl -I %p/../../include %s -DTEST_INTRINSICS_SUPPRESS_DEFS -DENABLE_ERROR 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
// XFAIL: vg_leak
include "llvm/IR/Intrinsics.td"
-// Make sure we can return up to 9 values.
-// CHECK-ENUM: returns_9_results = {{[0-9]+}}, // llvm.returns.9.results
+// Make sure we can return up to 265 values. Intrinsics are in alphabetical order.
+// CHECK-ENUM: returns_10_results = {{[0-9]+}}, // llvm.returns.10.results
+// CHECK-ENUM: returns_265_results, // llvm.returns.265.results
+// CHECK-ENUM: returns_9_results, // llvm.returns.9.results
+
+// Make sure the encoding table is correctly generated. Intrinsics are in reverse alphabetical order.
+// CHECK-IMPL: IIT_LongEncodingTable
+// CHECK-IMPL-NEXT: 49,
+// CHECK-IMPL-SAME: 15, 1, 15, 9, 15, 17, 15, 25, 15, 33, 15, 41, 15, 49, 15, 57, 15, 65, 0
+// CHECK-IMPL-NEXT: 64, 255
+// CHECK-IMPL-SAME: 15, 1, 15, 9, 15, 17, 15, 25, 15, 33, 15, 41, 15, 49, 15, 57, 15, 65, 15, 73, 15, 81,
+// CHECK-IMPL-NEXT: 64, 0
+// CHECK-IMPL-SAME: 15, 1, 15, 9, 15, 17, 15, 25, 15, 33, 15, 41, 15, 49, 15, 57, 15, 65, 15, 73, 0
def int_returns_9_results : Intrinsic<
!listsplat(llvm_anyint_ty, 9),
[], [], "llvm.returns.9.results">;
-#ifdef ENABLE_ERROR
-// CHECK-ERROR: error: intrinsics can only return upto 9 values, 'int_returns_10_results' returns 10 values
-// CHECK-ERROR-NEXT: def int_returns_10_results : Intrinsic<
def int_returns_10_results : Intrinsic<
!listsplat(llvm_anyint_ty, 10),
[], [], "llvm.returns.10.results">;
+def int_returns_265_results : Intrinsic<
+ !listsplat(llvm_anyint_ty, 265),
+ [], [], "llvm.returns.265.results">;
+
+#ifdef ENABLE_ERROR
+// CHECK-ERROR: error: intrinsics can only return upto 265 values, 'int_returns_266_results' returns 266 values
+// CHECK-ERROR-NEXT: def int_returns_266_results : Intrinsic<
+def int_returns_266_results : Intrinsic<
+ !listsplat(llvm_anyint_ty, 266),
+ [], [], "llvm.returns.10.results">;
+
#endif
diff --git a/llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp b/llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp
index bc42efa3b2e9c..0a64a5cbfb154 100644
--- a/llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp
+++ b/llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp
@@ -37,7 +37,7 @@ CodeGenIntrinsicContext::CodeGenIntrinsicContext(const RecordKeeper &RC) {
dyn_cast_or_null<ListInit>(RC.getGlobal("IIT_RetNumbers"));
if (!IIT_RetNumbers)
PrintFatalError("unable to find 'IIT_RetNumbers' list");
- MaxNumReturn = IIT_RetNumbers->size() - 1;
+ MaxNumReturn = IIT_RetNumbers->size() - 1 + /*IIT_STRUCTn*/ 256;
}
CodeGenIntrinsicTable::CodeGenIntrinsicTable(const RecordKeeper &RC) {
|
|
@llvm/pr-subscribers-llvm-ir Author: None (darkbuck) Changes
Full diff: https://github.com/llvm/llvm-project/pull/160434.diff 4 Files Affected:
diff --git a/llvm/include/llvm/IR/Intrinsics.td b/llvm/include/llvm/IR/Intrinsics.td
index 585371a6a4423..541f1bccdfe1a 100644
--- a/llvm/include/llvm/IR/Intrinsics.td
+++ b/llvm/include/llvm/IR/Intrinsics.td
@@ -337,6 +337,7 @@ def IIT_V6 : IIT_Vec<6, 60>;
def IIT_V10 : IIT_Vec<10, 61>;
def IIT_V2048 : IIT_Vec<2048, 62>;
def IIT_V4096 : IIT_Vec<4096, 63>;
+def IIT_STRUCTn : IIT_Base<64>;
}
defvar IIT_all_FixedTypes = !filter(iit, IIT_all,
@@ -663,7 +664,9 @@ class TypeInfoGen<
!if(!isa<LLVMMatchType>(ty), ACTys[MappingRIdxs[ty.Number]], ty));
list<int> TypeSig = !listflatten(!listconcat(
- [IIT_RetNumbers[!size(RetTypes)]],
+ [!cond(
+ !lt(!size(RetTypes), !size(IIT_RetNumbers)): IIT_RetNumbers[!size(RetTypes)],
+ true: [IIT_STRUCTn.Number, !sub(!size(RetTypes), !size(IIT_RetNumbers))])],
!foreach(i, !range(AllTypes),
!foreach(a, AllTypes[i].Sig,
ResolveArgCode<
diff --git a/llvm/lib/IR/Intrinsics.cpp b/llvm/lib/IR/Intrinsics.cpp
index 4d2e8fadff4f7..7298141f8b695 100644
--- a/llvm/lib/IR/Intrinsics.cpp
+++ b/llvm/lib/IR/Intrinsics.cpp
@@ -390,6 +390,9 @@ DecodeIITType(unsigned &NextElt, ArrayRef<unsigned char> Infos,
case IIT_EMPTYSTRUCT:
OutputTable.push_back(IITDescriptor::get(IITDescriptor::Struct, 0));
return;
+ case IIT_STRUCTn:
+ StructElts += Infos[NextElt++] + 1;
+ [[fallthrough]];
case IIT_STRUCT9:
++StructElts;
[[fallthrough]];
diff --git a/llvm/test/TableGen/intrinsic-struct.td b/llvm/test/TableGen/intrinsic-struct.td
index 467fd9057c183..c5ee2c3087ca2 100644
--- a/llvm/test/TableGen/intrinsic-struct.td
+++ b/llvm/test/TableGen/intrinsic-struct.td
@@ -1,22 +1,41 @@
// RUN: llvm-tblgen -gen-intrinsic-enums -I %p/../../include %s -DTEST_INTRINSICS_SUPPRESS_DEFS | FileCheck %s --check-prefix=CHECK-ENUM
-// RUN: llvm-tblgen -gen-intrinsic-impl -I %p/../../include %s -DTEST_INTRINSICS_SUPPRESS_DEFS > /dev/null 2>&1
+// RUN: llvm-tblgen -gen-intrinsic-impl -I %p/../../include %s -DTEST_INTRINSICS_SUPPRESS_DEFS | FileCheck %s --check-prefix=CHECK-IMPL
// RUN: not llvm-tblgen -gen-intrinsic-impl -I %p/../../include %s -DTEST_INTRINSICS_SUPPRESS_DEFS -DENABLE_ERROR 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
// XFAIL: vg_leak
include "llvm/IR/Intrinsics.td"
-// Make sure we can return up to 9 values.
-// CHECK-ENUM: returns_9_results = {{[0-9]+}}, // llvm.returns.9.results
+// Make sure we can return up to 265 values. Intrinsics are in alphabetical order.
+// CHECK-ENUM: returns_10_results = {{[0-9]+}}, // llvm.returns.10.results
+// CHECK-ENUM: returns_265_results, // llvm.returns.265.results
+// CHECK-ENUM: returns_9_results, // llvm.returns.9.results
+
+// Make sure the encoding table is correctly generated. Intrinsics are in reverse alphabetical order.
+// CHECK-IMPL: IIT_LongEncodingTable
+// CHECK-IMPL-NEXT: 49,
+// CHECK-IMPL-SAME: 15, 1, 15, 9, 15, 17, 15, 25, 15, 33, 15, 41, 15, 49, 15, 57, 15, 65, 0
+// CHECK-IMPL-NEXT: 64, 255
+// CHECK-IMPL-SAME: 15, 1, 15, 9, 15, 17, 15, 25, 15, 33, 15, 41, 15, 49, 15, 57, 15, 65, 15, 73, 15, 81,
+// CHECK-IMPL-NEXT: 64, 0
+// CHECK-IMPL-SAME: 15, 1, 15, 9, 15, 17, 15, 25, 15, 33, 15, 41, 15, 49, 15, 57, 15, 65, 15, 73, 0
def int_returns_9_results : Intrinsic<
!listsplat(llvm_anyint_ty, 9),
[], [], "llvm.returns.9.results">;
-#ifdef ENABLE_ERROR
-// CHECK-ERROR: error: intrinsics can only return upto 9 values, 'int_returns_10_results' returns 10 values
-// CHECK-ERROR-NEXT: def int_returns_10_results : Intrinsic<
def int_returns_10_results : Intrinsic<
!listsplat(llvm_anyint_ty, 10),
[], [], "llvm.returns.10.results">;
+def int_returns_265_results : Intrinsic<
+ !listsplat(llvm_anyint_ty, 265),
+ [], [], "llvm.returns.265.results">;
+
+#ifdef ENABLE_ERROR
+// CHECK-ERROR: error: intrinsics can only return upto 265 values, 'int_returns_266_results' returns 266 values
+// CHECK-ERROR-NEXT: def int_returns_266_results : Intrinsic<
+def int_returns_266_results : Intrinsic<
+ !listsplat(llvm_anyint_ty, 266),
+ [], [], "llvm.returns.10.results">;
+
#endif
diff --git a/llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp b/llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp
index bc42efa3b2e9c..0a64a5cbfb154 100644
--- a/llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp
+++ b/llvm/utils/TableGen/Basic/CodeGenIntrinsics.cpp
@@ -37,7 +37,7 @@ CodeGenIntrinsicContext::CodeGenIntrinsicContext(const RecordKeeper &RC) {
dyn_cast_or_null<ListInit>(RC.getGlobal("IIT_RetNumbers"));
if (!IIT_RetNumbers)
PrintFatalError("unable to find 'IIT_RetNumbers' list");
- MaxNumReturn = IIT_RetNumbers->size() - 1;
+ MaxNumReturn = IIT_RetNumbers->size() - 1 + /*IIT_STRUCTn*/ 256;
}
CodeGenIntrinsicTable::CodeGenIntrinsicTable(const RecordKeeper &RC) {
|
darkbuck
force-pushed
the
hliao/main/intrin-ret-num
branch
from
e87db1d to
1829b70
Compare
darkbuck
force-pushed
the
hliao/main/intrin-ret-num
branch
from
1829b70 to
14b913b
Compare
|
Thanks for the PR. It's best to give reviewers at least week before a reminder. That being said, I do plan to look at this in the next few days and will give feedback then. |
jurahul
reviewed
Sep 25, 2025
darkbuck
force-pushed
the
hliao/main/intrin-ret-num
branch
from
f012257 to
0941bc6
Compare
darkbuck
changed the title
jurahul
reviewed
Sep 26, 2025
jurahul
reviewed
Sep 26, 2025
jurahul
reviewed
Sep 26, 2025
jurahul
reviewed
Sep 26, 2025
darkbuck
force-pushed
the
hliao/main/intrin-ret-num
branch
from
0941bc6 to
79c11ee
Compare
jurahul
reviewed
Sep 26, 2025
|
Suggested PR description: Currently, Intrinsic can only have up to 9 return values. In case new intrinsics require more than 9 return values, additional |
darkbuck
force-pushed
the
hliao/main/intrin-ret-num
branch
from
79c11ee to
596ecd4
Compare
… return values - Currently, Intrinsic can only have up to 9 return values. In case new intrinsics require more than 9 return values, additional ITT_STRUCTxxx values need to be added to support > 9 return values. Instead, this patch unifies them into a single IIT_STRUCT followed by a BYTE specifying the minimal 2 (encoded as 0) and maximal 257 (encoded as 255) return values.
darkbuck
force-pushed
the
hliao/main/intrin-ret-num
branch
from
596ecd4 to
cbfa8a1
Compare
jurahul
approved these changes
Sep 26, 2025
|
committed in 9d7628d |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Currently, Intrinsic can only have up to 9 return values. In case new intrinsics require more than 9 return values, additional ITT_STRUCTxxx values need to be added to support > 9 return values. Instead, this patch unifies them into a single IIT_STRUCT followed by a BYTE specifying the minimal 2 (encoded as 0) and maximal 257 (encoded as 255) return values.