Skip to content

[PowerPC] Turn string pooling on by default. #65628

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 1 commit into from
Sep 7, 2023
Merged

[PowerPC] Turn string pooling on by default. #65628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static cl::opt<bool>
static cl::opt<bool> MergeStringPool(
"ppc-merge-string-pool",
cl::desc("Merge all of the strings in a module into one pool"),
cl::init(false), cl::Hidden);
cl::init(true), cl::Hidden);

static cl::opt<bool> EnablePPCGenScalarMASSEntries(
"enable-ppc-gen-scalar-mass", cl::init(false),
Expand Down
3 changes: 3 additions & 0 deletions llvm/test/CodeGen/PowerPC/O3-pipeline.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
; CHECK-NEXT: CodeGen Prepare
; CHECK-NEXT: Dominator Tree Construction
; CHECK-NEXT: Exception handling preparation
; CHECK-NEXT: PPC Merge String Pool
; CHECK-NEXT: FunctionPass Manager
; CHECK-NEXT: Dominator Tree Construction
; CHECK-NEXT: Natural Loop Information
; CHECK-NEXT: Scalar Evolution Analysis
; CHECK-NEXT: Prepare loop for ppc preferred instruction forms
Expand Down
28 changes: 16 additions & 12 deletions llvm/test/CodeGen/PowerPC/PR35812-neg-cmpxchg.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,21 @@ define signext i32 @main() nounwind {
; CHECK-NEXT: cmplwi 3, 234
; CHECK-NEXT: bne 0, .LBB0_7
; CHECK-NEXT: # %bb.5: # %L.B0001
; CHECK-NEXT: addis 3, 2, .Lstr.2@toc@ha
; CHECK-NEXT: addi 3, 3, .Lstr.2@toc@l
; CHECK-NEXT: addis 3, 2, .L__ModuleStringPool@toc@ha
; CHECK-NEXT: addi 3, 3, .L__ModuleStringPool@toc@l
; CHECK-NEXT: bl puts
; CHECK-NEXT: nop
; CHECK-NEXT: li 3, 0
; CHECK-NEXT: b .LBB0_9
; CHECK-NEXT: .LBB0_6: # %L.B0003
; CHECK-NEXT: addis 3, 2, .Lstr@toc@ha
; CHECK-NEXT: addi 3, 3, .Lstr@toc@l
; CHECK-NEXT: addis 3, 2, .L__ModuleStringPool@toc@ha
; CHECK-NEXT: addi 3, 3, .L__ModuleStringPool@toc@l
; CHECK-NEXT: addi 3, 3, 7
; CHECK-NEXT: b .LBB0_8
; CHECK-NEXT: .LBB0_7: # %L.B0005
; CHECK-NEXT: addis 3, 2, .Lstr.1@toc@ha
; CHECK-NEXT: addi 3, 3, .Lstr.1@toc@l
; CHECK-NEXT: addis 3, 2, .L__ModuleStringPool@toc@ha
; CHECK-NEXT: addi 3, 3, .L__ModuleStringPool@toc@l
; CHECK-NEXT: addi 3, 3, 53
; CHECK-NEXT: .LBB0_8: # %L.B0003
; CHECK-NEXT: bl puts
; CHECK-NEXT: nop
Expand Down Expand Up @@ -105,19 +107,21 @@ define signext i32 @main() nounwind {
; CHECK-P7-NEXT: cmplwi 3, 234
; CHECK-P7-NEXT: bne 0, .LBB0_7
; CHECK-P7-NEXT: # %bb.5: # %L.B0001
; CHECK-P7-NEXT: addis 3, 2, .Lstr.2@toc@ha
; CHECK-P7-NEXT: addi 3, 3, .Lstr.2@toc@l
; CHECK-P7-NEXT: addis 3, 2, .L__ModuleStringPool@toc@ha
; CHECK-P7-NEXT: addi 3, 3, .L__ModuleStringPool@toc@l
; CHECK-P7-NEXT: bl puts
; CHECK-P7-NEXT: nop
; CHECK-P7-NEXT: li 3, 0
; CHECK-P7-NEXT: b .LBB0_9
; CHECK-P7-NEXT: .LBB0_6: # %L.B0003
; CHECK-P7-NEXT: addis 3, 2, .Lstr@toc@ha
; CHECK-P7-NEXT: addi 3, 3, .Lstr@toc@l
; CHECK-P7-NEXT: addis 3, 2, .L__ModuleStringPool@toc@ha
; CHECK-P7-NEXT: addi 3, 3, .L__ModuleStringPool@toc@l
; CHECK-P7-NEXT: addi 3, 3, 7
; CHECK-P7-NEXT: b .LBB0_8
; CHECK-P7-NEXT: .LBB0_7: # %L.B0005
; CHECK-P7-NEXT: addis 3, 2, .Lstr.1@toc@ha
; CHECK-P7-NEXT: addi 3, 3, .Lstr.1@toc@l
; CHECK-P7-NEXT: addis 3, 2, .L__ModuleStringPool@toc@ha
; CHECK-P7-NEXT: addi 3, 3, .L__ModuleStringPool@toc@l
; CHECK-P7-NEXT: addi 3, 3, 53
; CHECK-P7-NEXT: .LBB0_8: # %L.B0003
; CHECK-P7-NEXT: bl puts
; CHECK-P7-NEXT: nop
Expand Down
9 changes: 3 additions & 6 deletions llvm/test/CodeGen/PowerPC/licm-remat.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,10 @@ declare void @llvm.memcpy.p0.p0.i64(ptr nocapture writeonly, ptr nocapture reado
define linkonce_odr void @ZN6snappyDecompressor_(ptr %this, ptr %writer) {
; CHECK-LABEL: ZN6snappyDecompressor_:
; CHECK: # %bb.0: # %entry
; CHECK: addis 3, 2, _ZN6snappy8internalL8wordmaskE@toc@ha
; CHECK-DAG: addi 25, 3, _ZN6snappy8internalL8wordmaskE@toc@l
; CHECK-DAG: addis 5, 2, _ZN6snappy8internalL10char_tableE@toc@ha
; CHECK-DAG: addi 24, 5, _ZN6snappy8internalL10char_tableE@toc@l
; CHECK: addis 3, 2, .L__ModuleStringPool@toc@ha
; CHECK: addi 25, 3, .L__ModuleStringPool@toc@l
; CHECK: .LBB0_2: # %for.cond
; CHECK-NOT: addis {{[0-9]+}}, 2, _ZN6snappy8internalL8wordmaskE@toc@ha
; CHECK-NOT: addis {{[0-9]+}}, 2, _ZN6snappy8internalL10char_tableE@toc@ha
; CHECK-NOT: addis {{[0-9]+}}, 2, .L__ModuleStringPool@toc@ha
; CHECK: bctrl
entry:
%ip_limit_ = getelementptr inbounds %"class.snappy::SnappyDecompressor", ptr %this, i64 0, i32 2
Expand Down
8 changes: 4 additions & 4 deletions llvm/test/CodeGen/PowerPC/mergeable-string-pool-large.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2
; RUN: llc -verify-machineinstrs -mtriple powerpc-ibm-aix-xcoff -mcpu=pwr8 \
; RUN: -ppc-merge-string-pool=true -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=AIX32
; RUN: -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=AIX32
; RUN: llc -verify-machineinstrs -mtriple powerpc64-ibm-aix-xcoff -mcpu=pwr8 \
; RUN: -ppc-merge-string-pool=true -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=AIX64
; RUN: -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=AIX64
; RUN: llc -verify-machineinstrs -mtriple powerpc64-unknown-linux -mcpu=pwr8 \
; RUN: -ppc-merge-string-pool=true -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=LINUX64BE
; RUN: -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=LINUX64BE
; RUN: llc -verify-machineinstrs -mtriple powerpc64le-unknown-linux -mcpu=pwr8 \
; RUN: -ppc-merge-string-pool=true -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=LINUX64LE
; RUN: -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=LINUX64LE

@.str.1 = private unnamed_addr constant [12 x i8] c"str1_STRING\00", align 1
@__const.IntArray0 = private unnamed_addr constant [7 x i32] [i32 5, i32 7, i32 9, i32 11, i32 17, i32 1235, i32 32], align 4
Expand Down
8 changes: 4 additions & 4 deletions llvm/test/CodeGen/PowerPC/mergeable-string-pool.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
; RUN: llc -verify-machineinstrs -mtriple powerpc-ibm-aix-xcoff -mcpu=pwr8 \
; RUN: -ppc-merge-string-pool=true -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=AIX32,AIXDATA
; RUN: -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=AIX32,AIXDATA
; RUN: llc -verify-machineinstrs -mtriple powerpc64-ibm-aix-xcoff -mcpu=pwr8 \
; RUN: -ppc-merge-string-pool=true -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=AIX64,AIXDATA
; RUN: -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=AIX64,AIXDATA
; RUN: llc -verify-machineinstrs -mtriple powerpc64-unknown-linux -mcpu=pwr8 \
; RUN: -ppc-merge-string-pool=true -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=LINUX64BE,LINUXDATA
; RUN: -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=LINUX64BE,LINUXDATA
; RUN: llc -verify-machineinstrs -mtriple powerpc64le-unknown-linux -mcpu=pwr8 \
; RUN: -ppc-merge-string-pool=true -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=LINUX64LE,LINUXDATA
; RUN: -ppc-asm-full-reg-names < %s | FileCheck %s --check-prefixes=LINUX64LE,LINUXDATA


;; This @GLOBALSTRING is a user of @.str which causes @.str to not get pooled.
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/PowerPC/toc-load-sched-bug.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ entry:
; CHECK: .globl _ZN4llvm11ParseIRFileERKSsRNS_12SMDiagnosticERNS_11LLVMContextE
; CHECK: bctrl
; CHECK: ld 2, 24(1)
; CHECK: addis [[REG:[0-9]+]], 2, .L.str@toc@ha
; CHECK: addi {{[0-9]+}}, [[REG]], .L.str@toc@l
; CHECK: addis [[REG:[0-9]+]], 2, .L__ModuleStringPool@toc@ha
; CHECK: addi {{[0-9]+}}, [[REG]], .L__ModuleStringPool@toc@l
; CHECK: bl _ZNSs6insertEmPKcm
%.atomicdst.i.i.i.i.i46 = alloca i32, align 4
%ref.tmp.i.i47 = alloca %"class.std::allocator", align 1
Expand Down