release/21.x: [AIX] Handle arbitrary sized integers when lowering formal arguments passed on the stack (#149351) #151734
+72
−3
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
|
@mandlebug What do you think about merging this PR to the release branch? |
|
@llvm/pr-subscribers-backend-powerpc Author: None (llvmbot) ChangesBackport f48a8da Requested by: @amy-kwan Full diff: https://github.com/llvm/llvm-project/pull/151734.diff 2 Files Affected:
diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
index 459525ed4ee9a..f179873b4dbd2 100644
--- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -7296,9 +7296,17 @@ SDValue PPCTargetLowering::LowerFormalArguments_AIX(
if (!ArgVT.isVector() && !ValVT.isVector() && ArgVT.isInteger() &&
ValVT.isInteger() &&
ArgVT.getScalarSizeInBits() < ValVT.getScalarSizeInBits()) {
- SDValue ArgValueTrunc = DAG.getNode(
- ISD::TRUNCATE, dl, ArgVT.getSimpleVT() == MVT::i1 ? MVT::i8 : ArgVT,
- ArgValue);
+ // It is possible to have either real integer values
+ // or integers that were not originally integers.
+ // In the latter case, these could have came from structs,
+ // and these integers would not have an extend on the parameter.
+ // Since these types of integers do not have an extend specified
+ // in the first place, the type of extend that we do should not matter.
+ EVT TruncatedArgVT = ArgVT.isSimple() && ArgVT.getSimpleVT() == MVT::i1
+ ? MVT::i8
+ : ArgVT;
+ SDValue ArgValueTrunc =
+ DAG.getNode(ISD::TRUNCATE, dl, TruncatedArgVT, ArgValue);
SDValue ArgValueExt =
ArgSignExt ? DAG.getSExtOrTrunc(ArgValueTrunc, dl, ValVT)
: DAG.getZExtOrTrunc(ArgValueTrunc, dl, ValVT);
diff --git a/llvm/test/CodeGen/PowerPC/aix-lower-arbitrary-sized-ints.ll b/llvm/test/CodeGen/PowerPC/aix-lower-arbitrary-sized-ints.ll
new file mode 100644
index 0000000000000..c119da6e050a9
--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/aix-lower-arbitrary-sized-ints.ll
@@ -0,0 +1,61 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
+; RUN: llc --verify-machineinstrs -mtriple powerpc-ibm-aix-xcoff \
+; RUN: -ppc-asm-full-reg-names -mcpu=pwr8 < %s | \
+; RUN: FileCheck %s --check-prefixes=CHECK,CHECK32
+; RUN: llc --verify-machineinstrs -mtriple powerpc64-ibm-aix-xcoff \
+; RUN: -ppc-asm-full-reg-names -mcpu=pwr8 < %s | \
+; RUN: FileCheck %s --check-prefixes=CHECK,CHECK64
+
+define ptr @lower_args(ptr %_0, i32 %0, i32 %1, i32 %2, i32 %3, ptr %4, ptr %5, i64 %6, i24 %7) {
+; CHECK-LABEL: lower_args:
+; CHECK: # %bb.0: # %entry
+; CHECK-NEXT: blr
+entry:
+ ret ptr %_0
+}
+
+define i32 @lower_args_withops_zeroext(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32 %g, i32 %h, i24 %i) {
+; CHECK32-LABEL: lower_args_withops_zeroext:
+; CHECK32: # %bb.0: # %entry
+; CHECK32-NEXT: lwz r3, 56(r1)
+; CHECK32-NEXT: addi r3, r3, 255
+; CHECK32-NEXT: clrlwi r3, r3, 8
+; CHECK32-NEXT: blr
+;
+; CHECK64-LABEL: lower_args_withops_zeroext:
+; CHECK64: # %bb.0: # %entry
+; CHECK64-NEXT: lwz r3, 116(r1)
+; CHECK64-NEXT: addi r3, r3, 255
+; CHECK64-NEXT: clrldi r3, r3, 40
+; CHECK64-NEXT: blr
+entry:
+ %0 = add i24 %i, 255
+ %1 = zext i24 %0 to i32
+ ret i32 %1
+}
+
+define i32 @lower_args_withops_signext(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32 %g, i32 %h, i24 signext %i) {
+; CHECK32-LABEL: lower_args_withops_signext:
+; CHECK32: # %bb.0: # %entry
+; CHECK32-NEXT: lwz r3, 56(r1)
+; CHECK32-NEXT: slwi r3, r3, 8
+; CHECK32-NEXT: srawi r3, r3, 8
+; CHECK32-NEXT: slwi r3, r3, 8
+; CHECK32-NEXT: addi r3, r3, 22272
+; CHECK32-NEXT: srawi r3, r3, 8
+; CHECK32-NEXT: blr
+;
+; CHECK64-LABEL: lower_args_withops_signext:
+; CHECK64: # %bb.0: # %entry
+; CHECK64-NEXT: lwz r3, 116(r1)
+; CHECK64-NEXT: slwi r3, r3, 8
+; CHECK64-NEXT: srawi r3, r3, 8
+; CHECK64-NEXT: addi r3, r3, 87
+; CHECK64-NEXT: sldi r3, r3, 40
+; CHECK64-NEXT: sradi r3, r3, 40
+; CHECK64-NEXT: blr
+entry:
+ %0 = add i24 %i, 87
+ %1 = sext i24 %0 to i32
+ ret i32 %1
+}
|
|
FYI @daltenty |
|
Still needs a review. |
|
ping |
daltenty
approved these changes
Aug 8, 2025
github-project-automation
bot
moved this from Needs Review
to Needs Merge
in LLVM Release Status
github-project-automation
bot
moved this from Needs Merge
to Done
in LLVM Release Status
…passed on the stack (llvm#149351) When arbitrary sized (non-simple type, or non-power of two types) integers are passed on the stack, these integers are not handled when lowering formal arguments on AIX as we always assume we will encounter simple type integers. However, it is possible for frontends to generate arbitrary sized immediate values in IR. Specifically in rustc, it will generate an integer value in LLVM IR for small structures that are less than a pointer size, which is done for optimization purposes for the Rust ABI. For example, if a Rust structure of three characters is passed into function on the stack, ``` struct my_struct { field1: u8, field2: u8, field3: u8, } ``` This will generate an `i24` type in LLVM IR. Currently, it is not obvious for the backend to distinguish an integer versus something that wasn't an integer to begin with (such as a struct), and the latter case would not have an extend on the parameter. Thus, this PR allows us to perform a truncation and extend on integers, both non-simple and simple types. (cherry picked from commit f48a8da)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport f48a8da
Requested by: @amy-kwan