Skip to content

[IPSCCP] Variable not visible at Og: #77901

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

Merged
merged 5 commits into from
Apr 16, 2024
Merged

[IPSCCP] Variable not visible at Og: #77901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
366c619
[IPSCCP] Variable not visible at Og:
CarlosAlbertoEnciso Jan 12, 2024
42cd75c
[IPSCCP] Variable not visible at Og:
CarlosAlbertoEnciso Jan 15, 2024
0637263
[IPSCCP] Variable not visible at Og:
CarlosAlbertoEnciso Jan 19, 2024
46d9de5
[IPSCCP] Variable not visible at Og:
CarlosAlbertoEnciso Apr 9, 2024
ab67821
[IPSCCP] Variable not visible at Og:
CarlosAlbertoEnciso Apr 16, 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
8 changes: 5 additions & 3 deletions llvm/lib/Transforms/Utils/Local.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3586,10 +3586,12 @@ DIExpression *llvm::getExpressionForConstant(DIBuilder &DIB, const Constant &C,
return createIntegerExpression(C);

auto *FP = dyn_cast<ConstantFP>(&C);
if (FP && (Ty.isFloatTy() || Ty.isDoubleTy())) {
if (FP && Ty.isFloatingPointTy() && Ty.getScalarSizeInBits() <= 64) {
const APFloat &APF = FP->getValueAPF();
return DIB.createConstantValueExpression(
APF.bitcastToAPInt().getZExtValue());
APInt const &API = APF.bitcastToAPInt();
if (auto Temp = API.getZExtValue())
return DIB.createConstantValueExpression(static_cast<uint64_t>(Temp));
return DIB.createConstantValueExpression(*API.getRawData());
}

if (!Ty.isPointerTy())
Expand Down
41 changes: 40 additions & 1 deletion llvm/test/Transforms/SCCP/pr50901.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,25 @@
; CHECK: = !DIGlobalVariableExpression(var: ![[DBG_FLOAT_UNDEF:.+]], expr: !DIExpression())
; CHECK-DAG: ![[DBG_FLOAT_UNDEF]] = distinct !DIGlobalVariable(name: "g_float_undef"

; CHECK: ![[G8:[0-9]+]] = !DIGlobalVariableExpression(var: ![[DBG8:[0-9]+]], expr: !DIExpression(DW_OP_constu, 22136, DW_OP_stack_value))
; CHECK-DAG: ![[DBG8]] = distinct !DIGlobalVariable(name: "g_88", {{.*}}
; CHECK: ![[G9:[0-9]+]] = !DIGlobalVariableExpression(var: ![[DBG9:[0-9]+]], expr: !DIExpression(DW_OP_constu, 23726, DW_OP_stack_value))
; CHECK-DAG: ![[DBG9]] = distinct !DIGlobalVariable(name: "g_99", {{.*}}

; CHECK-DAG: ![[DBGA:[0-9]+]] = distinct !DIGlobalVariable(name: "g_i32_undef"
; CHECK-DAG: ![[GA:[0-9]+]] = !DIGlobalVariableExpression(var: ![[DBGA]], expr: !DIExpression())
; CHECK-DAG: ![[DBGB:[0-9]+]] = distinct !DIGlobalVariable(name: "g_ptr_undef"
; CHECK-DAG: ![[GB:[0-9]+]] = !DIGlobalVariableExpression(var: ![[DBGB]], expr: !DIExpression())

@g_1 = dso_local global i32 -4, align 4, !dbg !0
@g_2 = dso_local global float 0x4011C28F60000000, align 4, !dbg !8
@g_3 = dso_local global i8 97, align 1, !dbg !10
@g_4 = dso_local global i32 4, align 4, !dbg !13
@g_5 = dso_local global i8 1, align 1, !dbg !16
@g_6 = dso_local global ptr null, align 8, !dbg !19
@g_7 = dso_local global ptr null, align 8, !dbg !23
@g_8 = dso_local global half 0xH4321, align 4, !dbg !86
@g_9 = dso_local global bfloat 0xR3F80, align 4, !dbg !90
@_ZL4g_11 = internal global i32 -5, align 4, !dbg !25
@_ZL4g_22 = internal global float 0x4016333340000000, align 4, !dbg !27
@_ZL4g_33 = internal global i8 98, align 1, !dbg !29
Expand All @@ -67,6 +79,10 @@
@_ZL4g_66 = internal global ptr null, align 8, !dbg !35
@_ZL4g_77 = internal global ptr inttoptr (i64 70 to ptr), align 8, !dbg !37
@g_float_undef = internal global float undef, align 4, !dbg !83
@_ZL4g_88 = internal global half 0xH5678, align 4, !dbg !88
@_ZL4g_99 = internal global bfloat 0xR5CAE, align 4, !dbg !92
@g_i32_undef = internal global i32 undef, align 4, !dbg !95
@g_ptr_undef = internal global ptr undef, align 8, !dbg !97

define dso_local void @_Z3barv() !dbg !46 {
entry:
Expand All @@ -88,6 +104,15 @@ entry:
store ptr %6, ptr @g_7, align 8, !dbg !59
%l = load float, ptr @g_float_undef, align 8, !dbg !59
store float %l, ptr @g_2, align 8, !dbg !59
%7 = load half, ptr @_ZL4g_88, align 4, !dbg !59
store half %7, ptr @g_8, align 4, !dbg !59
%8 = load bfloat, ptr @_ZL4g_99, align 4, !dbg !59
store bfloat %8, ptr @g_9, align 4, !dbg !59
%9 = load i32, ptr @g_i32_undef, align 4, !dbg !59
store i32 %9, ptr @g_1, align 4, !dbg !59
%10 = load ptr, ptr @g_ptr_undef, align 8, !dbg !59
store ptr %10, ptr @g_6, align 8, !dbg !59

ret void, !dbg !59
}

Expand All @@ -108,7 +133,7 @@ entry:
!4 = !{!5}
!5 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !6, size: 64)
!6 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
!7 = !{!0, !8, !10, !13, !16, !19, !23, !25, !27, !29, !31, !33, !35, !37, !83}
!7 = !{!0, !8, !10, !13, !16, !19, !23, !25, !27, !29, !31, !33, !35, !37, !83, !86, !88, !90, !92, !95, !97}
!8 = !DIGlobalVariableExpression(var: !9, expr: !DIExpression())
!9 = distinct !DIGlobalVariable(name: "g_2", scope: !2, file: !3, line: 2, type: !6, isLocal: false, isDefinition: true)
!10 = !DIGlobalVariableExpression(var: !11, expr: !DIExpression())
Expand Down Expand Up @@ -159,3 +184,17 @@ entry:
!82 = !DILocation(line: 31, column: 1, scope: !77)
!83 = !DIGlobalVariableExpression(var: !84, expr: !DIExpression())
!84 = distinct !DIGlobalVariable(name: "g_float_undef", linkageName: "g_float_undef", scope: !2, file: !3, line: 15, type: !6, isLocal: true, isDefinition: true)
!85 = !DIBasicType(name: "float", size: 16, encoding: DW_ATE_float)
!86 = !DIGlobalVariableExpression(var: !87, expr: !DIExpression())
!87 = distinct !DIGlobalVariable(name: "g_8", scope: !2, file: !3, line: 2, type: !85, isLocal: false, isDefinition: true)
!88 = !DIGlobalVariableExpression(var: !89, expr: !DIExpression())
!89 = distinct !DIGlobalVariable(name: "g_88", linkageName: "_ZL4g_88", scope: !2, file: !3, line: 10, type: !85, isLocal: true, isDefinition: true)
!90 = !DIGlobalVariableExpression(var: !91, expr: !DIExpression())
!91 = distinct !DIGlobalVariable(name: "g_9", scope: !2, file: !3, line: 2, type: !85, isLocal: false, isDefinition: true)
!92 = !DIGlobalVariableExpression(var: !93, expr: !DIExpression())
!93 = distinct !DIGlobalVariable(name: "g_99", linkageName: "_ZL4g_99", scope: !2, file: !3, line: 10, type: !85, isLocal: true, isDefinition: true)

!95 = !DIGlobalVariableExpression(var: !96, expr: !DIExpression())
!96 = distinct !DIGlobalVariable(name: "g_i32_undef", linkageName: "g_i32_undef", scope: !2, file: !3, line: 9, type: !22, isLocal: true, isDefinition: true)
!97 = !DIGlobalVariableExpression(var: !98, expr: !DIExpression())
!98 = distinct !DIGlobalVariable(name: "g_ptr_undef", linkageName: "g_ptr_undef", scope: !2, file: !3, line: 14, type: !21, isLocal: true, isDefinition: true)
21 changes: 12 additions & 9 deletions llvm/unittests/Transforms/Utils/LocalTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,6 +1241,18 @@ TEST(Local, ExpressionForConstant) {
EXPECT_NE(Expr, nullptr);
EXPECT_EQ(Expr->getElement(1), 13841306799765140275U);

// Half.
Type *HalfTy = Type::getHalfTy(Context);
Expr = createExpression(ConstantFP::get(HalfTy, 5.55), HalfTy);
EXPECT_NE(Expr, nullptr);
EXPECT_EQ(Expr->getElement(1), 17805U);

// BFloat.
Type *BFloatTy = Type::getBFloatTy(Context);
Expr = createExpression(ConstantFP::get(BFloatTy, -5.55), BFloatTy);
EXPECT_NE(Expr, nullptr);
EXPECT_EQ(Expr->getElement(1), 49330U);

// Pointer.
PointerType *PtrTy = PointerType::get(Context, 0);
Expr = createExpression(ConstantPointerNull::get(PtrTy), PtrTy);
Expand All @@ -1257,15 +1269,6 @@ TEST(Local, ExpressionForConstant) {
EXPECT_NE(Expr, nullptr);
EXPECT_EQ(Expr->getElement(1), 5678U);

// Others.
Type *HalfTy = Type::getHalfTy(Context);
Expr = createExpression(ConstantFP::get(HalfTy, 32), HalfTy);
EXPECT_EQ(Expr, nullptr);

Type *BFloatTy = Type::getBFloatTy(Context);
Expr = createExpression(ConstantFP::get(BFloatTy, 32), BFloatTy);
EXPECT_EQ(Expr, nullptr);

Type *FP128Ty = Type::getFP128Ty(Context);
Expr = createExpression(ConstantFP::get(FP128Ty, 32), FP128Ty);
EXPECT_EQ(Expr, nullptr);
Expand Down