This is an archive of the discontinued LLVM Phabricator instance.

Differential D19290

[PGOProfile] Make tests independent of the raw profile version (NFC)
ClosedPublic

Authored by vsk on Apr 19 2016, 3:26 PM.

Details

Reviewers
xur
Commits
rG932866bfe7f9: [test/PGOProfile] Make tests independent of the raw profile version (NFC)
rL266928: [test/PGOProfile] Make tests independent of the raw profile version (NFC)
Summary

This patch makes it easier to bump the raw profile version.

Diff Detail

Repository
rL LLVM

Event Timeline

vsk updated this revision to Diff 54278.Apr 19 2016, 3:26 PM
vsk retitled this revision from to [PGOProfile] Make tests independent of the raw profile version (NFC).
vsk updated this object.
vsk added a reviewer: xur.
vsk added a subscriber: llvm-commits.
xur accepted this revision.Apr 19 2016, 3:37 PM
xur edited edge metadata.

Look good to me.
Thanks for fixing this.

-Rong

This revision is now accepted and ready to land.Apr 19 2016, 3:37 PM
vsk updated this revision to Diff 54392.Apr 20 2016, 10:58 AM
vsk edited edge metadata.
  • Fix a bug where a lit variable capture is used on the wrong CHECK line.

The tests pass and @xur is ok with the idea here, so I'll commit this later today barring any objections.

Closed by commit rL266928: [test/PGOProfile] Make tests independent of the raw profile version (NFC) (authored by vedantk). · Explain WhyApr 20 2016, 3:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
test/
Transforms/
PGOProfile/
4 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines

Diff 54436

llvm/trunk/test/Transforms/PGOProfile/branch1.ll

; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN --check-prefix=GEN-COMDAT ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN --check-prefix=GEN-COMDAT
; RUN: opt < %s -mtriple=x86_64-apple-darwin -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN --check-prefix=GEN-DARWIN-LINKONCE ; RUN: opt < %s -mtriple=x86_64-apple-darwin -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN --check-prefix=GEN-DARWIN-LINKONCE
; RUN: llvm-profdata merge %S/Inputs/branch1.proftext -o %t.profdata ; RUN: llvm-profdata merge %S/Inputs/branch1.proftext -o %t.profdata
; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
; GEN-DARWIN-LINKONCE: target triple = "x86_64-apple-darwin" ; GEN-DARWIN-LINKONCE: target triple = "x86_64-apple-darwin"
; GEN-COMDAT: $__llvm_profile_raw_version = comdat any ; GEN-COMDAT: $__llvm_profile_raw_version = comdat any
; GEN-COMDAT: @__llvm_profile_raw_version = constant i64 72057594037927939, comdat ; GEN-COMDAT: @__llvm_profile_raw_version = constant i64 {{[0-9]+}}, comdat
; GEN-LINKONCE: @__llvm_profile_raw_version = linkonce constant i64 72057594037927939 ; GEN-LINKONCE: @__llvm_profile_raw_version = linkonce constant i64 {{[0-9]+}}
; GEN: @__profn_test_br_1 = private constant [9 x i8] c"test_br_1" ; GEN: @__profn_test_br_1 = private constant [9 x i8] c"test_br_1"
define i32 @test_br_1(i32 %i) { define i32 @test_br_1(i32 %i) {
entry: entry:
; GEN: entry: ; GEN: entry:
; GEN-NOT: llvm.instrprof.increment ; GEN-NOT: llvm.instrprof.increment
%cmp = icmp sgt i32 %i, 0 %cmp = icmp sgt i32 %i, 0
br i1 %cmp, label %if.then, label %if.end br i1 %cmp, label %if.then, label %if.end
Show All 16 Lines

llvm/trunk/test/Transforms/PGOProfile/branch2.ll

; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN
; RUN: llvm-profdata merge %S/Inputs/branch2.proftext -o %t.profdata ; RUN: llvm-profdata merge %S/Inputs/branch2.proftext -o %t.profdata
; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
; GEN: $__llvm_profile_raw_version = comdat any ; GEN: $__llvm_profile_raw_version = comdat any
; GEN: @__llvm_profile_raw_version = constant i64 72057594037927939, comdat ; GEN: @__llvm_profile_raw_version = constant i64 {{[0-9]+}}, comdat
; GEN: @__profn_test_br_2 = private constant [9 x i8] c"test_br_2" ; GEN: @__profn_test_br_2 = private constant [9 x i8] c"test_br_2"
define i32 @test_br_2(i32 %i) { define i32 @test_br_2(i32 %i) {
entry: entry:
; GEN: entry: ; GEN: entry:
; GEN-NOT: llvm.instrprof.increment ; GEN-NOT: llvm.instrprof.increment
%cmp = icmp sgt i32 %i, 0 %cmp = icmp sgt i32 %i, 0
br i1 %cmp, label %if.then, label %if.else br i1 %cmp, label %if.then, label %if.else
Show All 23 Lines

llvm/trunk/test/Transforms/PGOProfile/criticaledge.ll

; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN
; RUN: llvm-profdata merge %S/Inputs/criticaledge.proftext -o %t.profdata ; RUN: llvm-profdata merge %S/Inputs/criticaledge.proftext -o %t.profdata
; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
; GEN: $__llvm_profile_raw_version = comdat any ; GEN: $__llvm_profile_raw_version = comdat any
; GEN: @__llvm_profile_raw_version = constant i64 72057594037927939, comdat ; GEN: @__llvm_profile_raw_version = constant i64 {{[0-9]+}}, comdat
; GEN: @__profn_test_criticalEdge = private constant [17 x i8] c"test_criticalEdge" ; GEN: @__profn_test_criticalEdge = private constant [17 x i8] c"test_criticalEdge"
; GEN: @__profn__stdin__bar = private constant [11 x i8] c"<stdin>:bar" ; GEN: @__profn__stdin__bar = private constant [11 x i8] c"<stdin>:bar"
define i32 @test_criticalEdge(i32 %i, i32 %j) { define i32 @test_criticalEdge(i32 %i, i32 %j) {
entry: entry:
; CHECK: entry: ; CHECK: entry:
; GEN-NOT: call void @llvm.instrprof.increment ; GEN-NOT: call void @llvm.instrprof.increment
switch i32 %i, label %sw.default [ switch i32 %i, label %sw.default [
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines

llvm/trunk/test/Transforms/PGOProfile/landingpad.ll

; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN
; RUN: llvm-profdata merge %S/Inputs/landingpad.proftext -o %t.profdata ; RUN: llvm-profdata merge %S/Inputs/landingpad.proftext -o %t.profdata
; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
@val = global i32 0, align 4 @val = global i32 0, align 4
@_ZTIi = external constant i8* @_ZTIi = external constant i8*
; GEN: $__llvm_profile_raw_version = comdat any ; GEN: $__llvm_profile_raw_version = comdat any
; GEN: @__llvm_profile_raw_version = constant i64 72057594037927939, comdat ; GEN: @__llvm_profile_raw_version = constant i64 {{[0-9]+}}, comdat
; GEN: @__profn_bar = private constant [3 x i8] c"bar" ; GEN: @__profn_bar = private constant [3 x i8] c"bar"
; GEN: @__profn_foo = private constant [3 x i8] c"foo" ; GEN: @__profn_foo = private constant [3 x i8] c"foo"
define i32 @bar(i32 %i) { define i32 @bar(i32 %i) {
entry: entry:
; GEN: entry: ; GEN: entry:
; GEN-NOT: call void @llvm.instrprof.increment ; GEN-NOT: call void @llvm.instrprof.increment
%rem = srem i32 %i, 3 %rem = srem i32 %i, 3
▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines

llvm/trunk/test/Transforms/PGOProfile/loop1.ll

; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN
; RUN: llvm-profdata merge %S/Inputs/loop1.proftext -o %t.profdata ; RUN: llvm-profdata merge %S/Inputs/loop1.proftext -o %t.profdata
; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
; GEN: $__llvm_profile_raw_version = comdat any ; GEN: $__llvm_profile_raw_version = comdat any
; GEN: @__llvm_profile_raw_version = constant i64 72057594037927939, comdat ; GEN: @__llvm_profile_raw_version = constant i64 {{[0-9]+}}, comdat
; GEN: @__profn_test_simple_for = private constant [15 x i8] c"test_simple_for" ; GEN: @__profn_test_simple_for = private constant [15 x i8] c"test_simple_for"
define i32 @test_simple_for(i32 %n) { define i32 @test_simple_for(i32 %n) {
entry: entry:
; GEN: entry: ; GEN: entry:
; GEN-NOT: call void @llvm.instrprof.increment ; GEN-NOT: call void @llvm.instrprof.increment
br label %for.cond br label %for.cond
Show All 28 Lines

llvm/trunk/test/Transforms/PGOProfile/loop2.ll

; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN
; RUN: llvm-profdata merge %S/Inputs/loop2.proftext -o %t.profdata ; RUN: llvm-profdata merge %S/Inputs/loop2.proftext -o %t.profdata
; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
; GEN: $__llvm_profile_raw_version = comdat any ; GEN: $__llvm_profile_raw_version = comdat any
; GEN: @__llvm_profile_raw_version = constant i64 72057594037927939, comdat ; GEN: @__llvm_profile_raw_version = constant i64 {{[0-9]+}}, comdat
; GEN: @__profn_test_nested_for = private constant [15 x i8] c"test_nested_for" ; GEN: @__profn_test_nested_for = private constant [15 x i8] c"test_nested_for"
define i32 @test_nested_for(i32 %r, i32 %s) { define i32 @test_nested_for(i32 %r, i32 %s) {
entry: entry:
; GEN: entry: ; GEN: entry:
; GEN-NOT: call void @llvm.instrprof.increment ; GEN-NOT: call void @llvm.instrprof.increment
br label %for.cond.outer br label %for.cond.outer
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines

llvm/trunk/test/Transforms/PGOProfile/single_bb.ll

; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
; GEN: $__llvm_profile_raw_version = comdat any ; GEN: $__llvm_profile_raw_version = comdat any
; GEN: @__llvm_profile_raw_version = constant i64 72057594037927939, comdat ; GEN: @__llvm_profile_raw_version = constant i64 {{[0-9]+}}, comdat
; GEN: @__profn_single_bb = private constant [9 x i8] c"single_bb" ; GEN: @__profn_single_bb = private constant [9 x i8] c"single_bb"
define i32 @single_bb() { define i32 @single_bb() {
entry: entry:
; GEN: entry: ; GEN: entry:
; GEN: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @__profn_single_bb, i32 0, i32 0), i64 12884901887, i32 1, i32 0) ; GEN: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @__profn_single_bb, i32 0, i32 0), i64 12884901887, i32 1, i32 0)
ret i32 0 ret i32 0
} }

llvm/trunk/test/Transforms/PGOProfile/switch.ll

; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN
; RUN: llvm-profdata merge %S/Inputs/switch.proftext -o %t.profdata ; RUN: llvm-profdata merge %S/Inputs/switch.proftext -o %t.profdata
; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
; GEN: $__llvm_profile_raw_version = comdat any ; GEN: $__llvm_profile_raw_version = comdat any
; GEN: @__llvm_profile_raw_version = constant i64 72057594037927939, comdat ; GEN: @__llvm_profile_raw_version = constant i64 {{[0-9]+}}, comdat
; GEN: @__profn_test_switch = private constant [11 x i8] c"test_switch" ; GEN: @__profn_test_switch = private constant [11 x i8] c"test_switch"
define void @test_switch(i32 %i) { define void @test_switch(i32 %i) {
entry: entry:
; GEN: entry: ; GEN: entry:
; GEN-NOT: call void @llvm.instrprof.increment ; GEN-NOT: call void @llvm.instrprof.increment
switch i32 %i, label %sw.default [ switch i32 %i, label %sw.default [
i32 1, label %sw.bb i32 1, label %sw.bb
Show All 33 Lines