This is an archive of the discontinued LLVM Phabricator instance.

Differential D85215

[HotColdSplit] Remove target triples from architecture-agnostic testcases
AbandonedPublic

Authored by hiraditya on Aug 4 2020, 8:53 AM.

Details

Reviewers
rcorcs
vsk
tejohnson
CarolineConcatto
JamesNagurne
rjf
Summary

This fixes the build errors on ARM machines ; see relevant discussions in D85148
and D69384.

Diff Detail

Unit TestsFailed

TimeTest
270 mslinux > LLVM.Transforms/HotColdSplit::coldentrycount.ll
130 mswindows > LLVM.Transforms/HotColdSplit::coldentrycount.ll

Event Timeline

rjf created this revision.Aug 4 2020, 8:53 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 4 2020, 8:53 AM
Herald added subscribers: llvm-commits, kristof.beyls. · View Herald Transcript
rjf requested review of this revision.Aug 4 2020, 8:53 AM
hiraditya accepted this revision.Aug 4 2020, 8:54 AM

Thanks for fixing it quickly @rjf

This revision is now accepted and ready to land.Aug 4 2020, 8:54 AM
hiraditya mentioned this in D69384: [HotColdSplit] Add unlikely attribute to outlined function.Aug 4 2020, 8:54 AM
hiraditya added reviewers: vsk, tejohnson.
JamesNagurne mentioned this in D85148: Fix ARM build bots failures due to disabled x86_64-apple target.Aug 4 2020, 8:57 AM
rjf mentioned this in D69257: Outline non returning functions unless a longjmp.Aug 4 2020, 9:00 AM
rjf added reviewers: CarolineConcatto, JamesNagurne.
rjf added a comment.Aug 4 2020, 9:38 AM

Looks like coldentrycount.ll is still causing a problem @hiraditya .

Harbormaster completed remote builds in B66947: Diff 282937.Aug 4 2020, 9:52 AM
RKSimon added a subscriber: RKSimon.Aug 4 2020, 10:43 AM
In D85215#2193705, @rjf wrote:

Looks like coldentrycount.ll is still causing a problem @hiraditya .

If this is not going to work anytime soon - it would be better to revert the original patch for now.

hiraditya added a comment.Aug 4 2020, 10:50 AM

Should I land D85148 then? I'd like to keep the test case if possible.

hiraditya commandeered this revision.Aug 4 2020, 10:53 AM
hiraditya edited reviewers, added: rjf; removed: hiraditya.
This revision now requires review to proceed.Aug 4 2020, 10:53 AM
hiraditya abandoned this revision.Aug 4 2020, 10:53 AM

will revert the old patch.

hiraditya added a comment.Aug 4 2020, 11:18 AM

reverted : D85229

hiraditya added a comment.Aug 4 2020, 1:52 PM

Fixed in: D85232

Revision Contents

PathSize
llvm/
test/
Transforms/
HotColdSplit/
3 lines
2 lines
3 lines
2 lines
2 lines

Diff 282937

llvm/test/Transforms/HotColdSplit/coldentrycount.ll

; Test to ensure that split cold function gets 0 entry count profile ; Test to ensure that split cold function gets 0 entry count profile
; metadata when compiling with pgo. ; metadata when compiling with pgo.
; RUN: opt -hotcoldsplit -hotcoldsplit-threshold=0 -codegenprepare -S < %s | FileCheck %s ; RUN: opt -hotcoldsplit -hotcoldsplit-threshold=0 -codegenprepare -S < %s | FileCheck %s
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.14.0"
; CHECK: define {{.*}} @fun{{.*}} ![[HOTPROF:[0-9]+]] {{.*}}section_prefix ![[LIKELY:[0-9]+]] ; CHECK: define {{.*}} @fun{{.*}} ![[HOTPROF:[0-9]+]] {{.*}}section_prefix ![[LIKELY:[0-9]+]]
; CHECK: call void @fun.cold.1 ; CHECK: call void @fun.cold.1
define void @fun() !prof !14 { define void @fun() !prof !14 {
entry: entry:
br i1 undef, label %if.then, label %if.else br i1 undef, label %if.then, label %if.else
if.then: if.then:
Show All 35 Lines

llvm/test/Transforms/HotColdSplit/longjmp-nosplit.ll

; RUN: opt -hotcoldsplit -S < %s | FileCheck %s ; RUN: opt -hotcoldsplit -S < %s | FileCheck %s
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
%struct.__jmp_buf_tag = type { [8 x i64], i32, %struct.__sigset_t } %struct.__jmp_buf_tag = type { [8 x i64], i32, %struct.__sigset_t }
%struct.__sigset_t = type { [16 x i64] } %struct.__sigset_t = type { [16 x i64] }
@c = dso_local global i32 1, align 4 @c = dso_local global i32 1, align 4
@buf = dso_local global [20 x i8*] zeroinitializer, align 16 @buf = dso_local global [20 x i8*] zeroinitializer, align 16
; CHECK-LABEL: @f ; CHECK-LABEL: @f
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines

llvm/test/Transforms/HotColdSplit/longjmp-split.ll

; RUN: opt -profile-summary-cold-count=0 -hotcoldsplit -S < %s | FileCheck %s ; RUN: opt -profile-summary-cold-count=0 -hotcoldsplit -S < %s | FileCheck %s
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
%struct.__jmp_buf_tag = type { [8 x i64], i32, %struct.__sigset_t } %struct.__jmp_buf_tag = type { [8 x i64], i32, %struct.__sigset_t }
%struct.__sigset_t = type { [16 x i64] } %struct.__sigset_t = type { [16 x i64] }
@c = dso_local global i32 1, align 4 @c = dso_local global i32 1, align 4
@buf = dso_local global [20 x i8*] zeroinitializer, align 16 @buf = dso_local global [20 x i8*] zeroinitializer, align 16
; CHECK-LABEL: @f ; CHECK-LABEL: @f
; CHECK: f.cold.1 ; CHECK: f.cold.1
▲ Show 20 Lines • Show All 119 Lines • Show Last 20 Lines

llvm/test/Transforms/HotColdSplit/sjlj-nosplit.ll

; RUN: opt -hotcoldsplit -S < %s | FileCheck %s ; RUN: opt -hotcoldsplit -S < %s | FileCheck %s
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@c = dso_local global i32 1, align 4 @c = dso_local global i32 1, align 4
@buf = dso_local global [20 x i8*] zeroinitializer, align 16 @buf = dso_local global [20 x i8*] zeroinitializer, align 16
; CHECK-LABEL: @f ; CHECK-LABEL: @f
; CHECK-NOT: f.cold.1 ; CHECK-NOT: f.cold.1
define dso_local void @f() #0 { define dso_local void @f() #0 {
entry: entry:
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

llvm/test/Transforms/HotColdSplit/sjlj-split.ll

; RUN: opt -profile-summary-cold-count=0 -hotcoldsplit -S < %s | FileCheck %s ; RUN: opt -profile-summary-cold-count=0 -hotcoldsplit -S < %s | FileCheck %s
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@c = dso_local global i32 1, align 4 @c = dso_local global i32 1, align 4
@buf = dso_local global [20 x i8*] zeroinitializer, align 16 @buf = dso_local global [20 x i8*] zeroinitializer, align 16
; CHECK-LABEL: @f ; CHECK-LABEL: @f
; CHECK: f.cold.1 ; CHECK: f.cold.1
define dso_local void @f() #0 !prof !31 { define dso_local void @f() #0 !prof !31 {
entry: entry:
▲ Show 20 Lines • Show All 125 Lines • Show Last 20 Lines