Skip to content

[RISCV] When using global merging, don't enable merging of external globals by default #115484

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
Nov 9, 2024
Merged

[RISCV] When using global merging, don't enable merging of external globals by default #115484

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
10 changes: 9 additions & 1 deletion llvm/lib/Target/RISCV/RISCVTargetMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ static cl::opt<cl::boolOrDefault>
EnableGlobalMerge("riscv-enable-global-merge", cl::Hidden,
cl::desc("Enable the global merge pass"));

static cl::opt<bool> ForceEnableGlobalMergeExternalGlobals(
"riscv-force-enable-global-merge-external-globals", cl::Hidden,
cl::init(false),
cl::desc(
"If the global merge pass is enabled, force enable global merging of "
"external globals (overriding any logic that might disable it)"));

static cl::opt<bool>
EnableMachineCombiner("riscv-enable-machine-combiner",
cl::desc("Enable the machine combiner pass"),
Expand Down Expand Up @@ -472,7 +479,8 @@ bool RISCVPassConfig::addPreISel() {
if (EnableGlobalMerge == cl::BOU_TRUE) {
addPass(createGlobalMergePass(TM, /* MaxOffset */ 2047,
/* OnlyOptimizeForSize */ false,
/* MergeExternalByDefault */ true));
/* MergeExternalByDefault */
ForceEnableGlobalMergeExternalGlobals));
}

return false;
Expand Down
7 changes: 4 additions & 3 deletions llvm/test/CodeGen/RISCV/global-merge-minsize-smalldata-nonzero.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=riscv64 -riscv-enable-global-merge -verify-machineinstrs < %s \
; RUN: | FileCheck %s -check-prefix=SMALL-DATA
; RUN: llc -mtriple=riscv64 -riscv-enable-global-merge -riscv-force-enable-global-merge-external-globals \
; RUN: -verify-machineinstrs < %s | FileCheck %s -check-prefix=SMALL-DATA
; RUN: llc -mtriple=riscv64 -riscv-enable-global-merge -global-merge-min-data-size=0 \
; RUN: -verify-machineinstrs < %s | FileCheck %s -check-prefix=MINSIZE
; RUN: -riscv-force-enable-global-merge-external-globals -verify-machineinstrs < %s \
; RUN: | FileCheck %s -check-prefix=MINSIZE

@ig1 = internal global i32 0, align 4
@ig2 = internal global i32 0, align 4
Expand Down
7 changes: 4 additions & 3 deletions llvm/test/CodeGen/RISCV/global-merge-minsize-smalldata-zero.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=riscv32 -riscv-enable-global-merge -verify-machineinstrs < %s \
; RUN: | FileCheck %s -check-prefix=SMALL-DATA
; RUN: llc -mtriple=riscv32 -riscv-enable-global-merge -riscv-force-enable-global-merge-external-globals \
; RUN: -verify-machineinstrs < %s | FileCheck %s -check-prefix=SMALL-DATA
; RUN: llc -mtriple=riscv64 -riscv-enable-global-merge -global-merge-min-data-size=5 \
; RUN: -verify-machineinstrs < %s | FileCheck %s -check-prefix=MINSIZE
; RUN: -riscv-force-enable-global-merge-external-globals -verify-machineinstrs < %s \
; RUN: | FileCheck %s -check-prefix=MINSIZE

@ig1 = internal global i32 0, align 4
@ig2 = internal global i32 0, align 4
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/CodeGen/RISCV/global-merge-minsize.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=riscv32 -riscv-enable-global-merge -verify-machineinstrs < %s \
; RUN: | FileCheck %s -check-prefix=RV32
; RUN: llc -mtriple=riscv32 -riscv-enable-global-merge -riscv-force-enable-global-merge-external-globals \
; RUN: -verify-machineinstrs < %s | FileCheck %s -check-prefix=RV32
; RUN: llc -mtriple=riscv32 -riscv-enable-global-merge -global-merge-min-data-size=5 \
; RUN: -verify-machineinstrs < %s | FileCheck %s -check-prefix=RV32-MINSIZE
; RUN: -riscv-force-enable-global-merge-external-globals -verify-machineinstrs < %s | FileCheck %s -check-prefix=RV32-MINSIZE

@ig1 = internal global i32 0, align 4
@ig2 = internal global i32 0, align 4
Expand Down
8 changes: 4 additions & 4 deletions llvm/test/CodeGen/RISCV/global-merge-offset.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
; RUN: sed 's/ArrSize/100/g' %s | llc -mtriple=riscv32 -riscv-enable-global-merge \
; RUN: -verify-machineinstrs | FileCheck %s
; RUN: -riscv-force-enable-global-merge-external-globals -verify-machineinstrs | FileCheck %s
; RUN: sed 's/ArrSize/100/g' %s | llc -mtriple=riscv64 -riscv-enable-global-merge \
; RUN: -verify-machineinstrs | FileCheck %s
; RUN: -riscv-force-enable-global-merge-external-globals -verify-machineinstrs | FileCheck %s
; RUN: sed 's/ArrSize/101/g' %s | llc -mtriple=riscv32 -riscv-enable-global-merge \
; RUN: -verify-machineinstrs | FileCheck %s -check-prefix=CHECK-TOOBIG
; RUN: -riscv-force-enable-global-merge-external-globals -verify-machineinstrs | FileCheck %s -check-prefix=CHECK-TOOBIG
; RUN: sed 's/ArrSize/101/g' %s | llc -mtriple=riscv64 -riscv-enable-global-merge \
; RUN: -verify-machineinstrs | FileCheck %s -check-prefix=CHECK-TOOBIG
; RUN: -riscv-force-enable-global-merge-external-globals -verify-machineinstrs | FileCheck %s -check-prefix=CHECK-TOOBIG

; This test demonstrates that the MaxOffset is set correctly for RISC-V by
; constructing an input that is at the limit and comparing.
Expand Down
22 changes: 20 additions & 2 deletions llvm/test/CodeGen/RISCV/global-merge.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
; RUN: | FileCheck %s
; RUN: llc -mtriple=riscv64 -riscv-enable-global-merge -verify-machineinstrs < %s \
; RUN: | FileCheck %s
; RUN: llc -mtriple=riscv32 -riscv-enable-global-merge \
; RUN: -riscv-force-enable-global-merge-external-globals -verify-machineinstrs < %s \
; RUN: | FileCheck -check-prefix=CHECK-WEXTERN %s
; RUN: llc -mtriple=riscv64 -riscv-enable-global-merge \
; RUN: -riscv-force-enable-global-merge-external-globals -verify-machineinstrs < %s \
; RUN: | FileCheck -check-prefix=CHECK-WEXTERN %s

@ig1 = internal global i32 0, align 4
@ig2 = internal global i32 0, align 4
Expand All @@ -21,9 +27,21 @@ define void @f1(i32 %a) nounwind {
; CHECK-NEXT: sw a0, %lo(.L_MergedGlobals)(a1)
; CHECK-NEXT: addi a1, a1, %lo(.L_MergedGlobals)
; CHECK-NEXT: sw a0, 4(a1)
; CHECK-NEXT: sw a0, 8(a1)
; CHECK-NEXT: sw a0, 12(a1)
; CHECK-NEXT: lui a1, %hi(eg1)
; CHECK-NEXT: sw a0, %lo(eg1)(a1)
; CHECK-NEXT: lui a1, %hi(eg2)
; CHECK-NEXT: sw a0, %lo(eg2)(a1)
; CHECK-NEXT: ret
;
; CHECK-WEXTERN-LABEL: f1:
; CHECK-WEXTERN: # %bb.0:
; CHECK-WEXTERN-NEXT: lui a1, %hi(.L_MergedGlobals)
; CHECK-WEXTERN-NEXT: sw a0, %lo(.L_MergedGlobals)(a1)
; CHECK-WEXTERN-NEXT: addi a1, a1, %lo(.L_MergedGlobals)
; CHECK-WEXTERN-NEXT: sw a0, 4(a1)
; CHECK-WEXTERN-NEXT: sw a0, 8(a1)
; CHECK-WEXTERN-NEXT: sw a0, 12(a1)
; CHECK-WEXTERN-NEXT: ret
store i32 %a, ptr @ig1, align 4
store i32 %a, ptr @ig2, align 4
store i32 %a, ptr @eg1, align 4
Expand Down
Loading