maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[SampleFDO] Add two passes of MIRAddFSDiscriminatorsPass 

This patch adds Pass1 of MIRADDFSDiscriminatorsPass before register
allocation, and Pass2 of MIRAddFSDiscriminatorsPass before
Block-Placement. This is still under --enable-fs-discrmininator
option (default false).

This would reduce the turn-around time for FSAFDO transition.

Differential Revision: https://reviews.llvm.org/D104579
This commit is contained in:
Rong Xu 2021-08-11 10:56:03 -07:00
parent 7de439b2be
commit 4c5909ba83
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/CodeGen/TargetPassConfig.cpp
View File

@ -1113,6 +1113,12 @@ void TargetPassConfig::addMachinePasses() {
// where it becomes safe again so stop debugifying here. // where it becomes safe again so stop debugifying here.
DebugifyIsSafe = false; DebugifyIsSafe = false;
// Add a FSDiscriminator pass right before RA, so that we could get
// more precise SampleFDO profile for RA.
if (EnableFSDiscriminator)
addPass(createMIRAddFSDiscriminatorsPass(
sampleprof::FSDiscriminatorPass::Pass1));
// Run register allocation and passes that are tightly coupled with it, // Run register allocation and passes that are tightly coupled with it,
// including phi elimination and scheduling. // including phi elimination and scheduling.
if (getOptimizeRegAlloc()) if (getOptimizeRegAlloc())
@ -1465,6 +1471,9 @@ bool TargetPassConfig::addGCPasses() {
/// Add standard basic block placement passes. /// Add standard basic block placement passes.
void TargetPassConfig::addBlockPlacement() { void TargetPassConfig::addBlockPlacement() {
if (EnableFSDiscriminator)
addPass(createMIRAddFSDiscriminatorsPass(
sampleprof::FSDiscriminatorPass::Pass2));
if (addPass(&MachineBlockPlacementID)) { if (addPass(&MachineBlockPlacementID)) {
// Run a separate pass to collect block placement statistics. // Run a separate pass to collect block placement statistics.
if (EnableBlockPlacementStats) if (EnableBlockPlacementStats)

4
llvm/test/CodeGen/X86/fsafdo_test1.ll
View File

@ -3,8 +3,8 @@
; Check that fs-afdo discriminators are generated. ; Check that fs-afdo discriminators are generated.
; CHECK: .loc 1 7 3 is_stmt 0 discriminator 2 # foo.c:7:3 ; CHECK: .loc 1 7 3 is_stmt 0 discriminator 2 # foo.c:7:3
; Check: .loc 1 9 5 is_stmt 1 discriminator 2 # foo.c:9:5 ; Check: .loc 1 9 5 is_stmt 1 discriminator 2 # foo.c:9:5
; CHECK: .loc 1 9 5 is_stmt 0 discriminator 268435458 # foo.c:9:5 ; CHECK: .loc 1 9 5 is_stmt 0 discriminator 11266 # foo.c:9:5
; CHECK: .loc 1 7 3 is_stmt 1 discriminator 3892314114 # foo.c:7:3 ; CHECK: .loc 1 7 3 is_stmt 1 discriminator 11266 # foo.c:7:3
; Check that variable __llvm_fs_discriminator__ is generated. ; Check that variable __llvm_fs_discriminator__ is generated.
; CHECK: .type __llvm_fs_discriminator__,@object # @__llvm_fs_discriminator__ ; CHECK: .type __llvm_fs_discriminator__,@object # @__llvm_fs_discriminator__
; CHECK: .section .rodata,"a",@progbits ; CHECK: .section .rodata,"a",@progbits

6
llvm/test/CodeGen/X86/fsafdo_test2.ll
View File

@ -38,9 +38,9 @@
;; ;;
;; Check that fs-afdo discriminators are generated. ;; Check that fs-afdo discriminators are generated.
; CHECK: .loc 1 23 9 is_stmt 0 discriminator 1 # unroll.c:23:9 ; CHECK: .loc 1 23 9 is_stmt 0 discriminator 1 # unroll.c:23:9
; CHECK: .loc 1 23 9 is_stmt 0 discriminator 3892314113 # unroll.c:23:9 ; CHECK: .loc 1 23 9 is_stmt 0 discriminator 3585 # unroll.c:23:9
; CHECK: .loc 1 23 9 is_stmt 0 discriminator 2818572289 # unroll.c:23:9 ; CHECK: .loc 1 23 9 is_stmt 0 discriminator 8705 # unroll.c:23:9
; CHECK: .loc 1 23 9 is_stmt 0 discriminator 3623878657 # unroll.c:23:9 ; CHECK: .loc 1 23 9 is_stmt 0 discriminator 4097 # unroll.c:23:9
;; ;;
;; Check that variable __llvm_fs_discriminator__ is generated. ;; Check that variable __llvm_fs_discriminator__ is generated.
; CHECK: .type __llvm_fs_discriminator__,@object # @__llvm_fs_discriminator__ ; CHECK: .type __llvm_fs_discriminator__,@object # @__llvm_fs_discriminator__