This is an archive of the discontinued LLVM Phabricator instance.

Differential D86008

[test] Fix aggregate-assign-call.c in preparation for -enable-npm-optnone
ClosedPublic

Authored by aeubanks on Aug 14 2020, 5:12 PM.

Details

Reviewers
ychen
asbirlea
Commits
rGb0ceff94d663: [test] Fix aggregate-assign-call.c in preparation for -enable-npm-optnone
Summary

Pin the test to use -enable-npm-optnone.
Before, optnone wasn't implemented under NPM, so the LPM and NPM runs produced different IR. Now with -enable-npm-optnone, that is no longer necessary.

Diff Detail

Event Timeline

aeubanks created this revision.Aug 14 2020, 5:12 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 14 2020, 5:12 PM
Herald added subscribers: cfe-commits, dexonsmith, steven_wu, hiraditya. · View Herald Transcript
aeubanks requested review of this revision.Aug 14 2020, 5:12 PM
aeubanks updated this revision to Diff 285797.Aug 14 2020, 5:22 PM

Split out other test

aeubanks retitled this revision from [NewPM][optnone] Fix clang tests in preparation for -enable-npm-optnone to [test] Fix aggregate-assign-call.c in preparation for -enable-npm-optnone.Aug 14 2020, 5:22 PM
aeubanks edited the summary of this revision. (Show Details)
aeubanks added reviewers: ychen, asbirlea.
ychen accepted this revision.Aug 14 2020, 5:32 PM

LGTM.

This revision is now accepted and ready to land.Aug 14 2020, 5:32 PM
Harbormaster completed remote builds in B68493: Diff 285795.Aug 14 2020, 5:51 PM
Harbormaster completed remote builds in B68494: Diff 285797.Aug 14 2020, 6:01 PM
Closed by commit rGb0ceff94d663: [test] Fix aggregate-assign-call.c in preparation for -enable-npm-optnone (authored by aeubanks). · Explain WhyAug 17 2020, 10:07 AM
This revision was automatically updated to reflect the committed changes.
aeubanks added a commit: rGb0ceff94d663: [test] Fix aggregate-assign-call.c in preparation for -enable-npm-optnone.

Revision Contents

PathSize
clang/
test/
CodeGen/
37 lines

Diff 286059

clang/test/CodeGen/aggregate-assign-call.c

// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -O1 -fno-experimental-new-pass-manager -S -emit-llvm -o - %s | FileCheck %s --check-prefixes=O1,O1-LEGACY // RUN: %clang_cc1 -fexperimental-new-pass-manager -mllvm -enable-npm-optnone -triple x86_64-unknown-linux-gnu -O1 -S -emit-llvm -o - %s | FileCheck %s --check-prefixes=O1
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -O1 -fexperimental-new-pass-manager -S -emit-llvm -o - %s | FileCheck %s --check-prefixes=O1,O1-NEWPM // RUN: %clang_cc1 -fno-experimental-new-pass-manager -triple x86_64-unknown-linux-gnu -O1 -S -emit-llvm -o - %s | FileCheck %s --check-prefixes=O1
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -O0 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=O0 // RUN: %clang_cc1 -fexperimental-new-pass-manager -mllvm -enable-npm-optnone -triple x86_64-unknown-linux-gnu -O0 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=O0
// RUN: %clang_cc1 -fno-experimental-new-pass-manager -triple x86_64-unknown-linux-gnu -O0 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=O0
// //
// Ensure that we place appropriate lifetime markers around indirectly returned // Ensure that we place appropriate lifetime markers around indirectly returned
// temporaries, and that the lifetime.ends appear in a timely manner. // temporaries, and that the lifetime.ends appear in a timely manner.
// //
// -O1 is used so lifetime markers actually get emitted. // -O1 is used so lifetime markers actually get emitted.
struct S { struct S {
int ns[40]; int ns[40];
Show All 37 Linesstruct S baz(int i, volatile int *j) {
// O0-NOT: @llvm.lifetime.end // O0-NOT: @llvm.lifetime.end
struct S r; struct S r;
// O1: %[[TMP1_ALLOCA:[^ ]+]] = alloca %struct.S // O1: %[[TMP1_ALLOCA:[^ ]+]] = alloca %struct.S
// O1: %[[TMP2_ALLOCA:[^ ]+]] = alloca %struct.S // O1: %[[TMP2_ALLOCA:[^ ]+]] = alloca %struct.S
do { do {
// O1: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP1_ALLOCA]] to i8* // O1: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP1_ALLOCA]] to i8*
// O1-LEGACY: call void @llvm.lifetime.start.p0i8({{[^,]*}}, i8* %[[P]]) // O1: call void @llvm.lifetime.start.p0i8({{[^,]*}}, i8* %[[P]])
// O1-NEWPM: call void @llvm.lifetime.start.p0i8({{[^,]*}}, i8* nonnull %[[P]])
// //
// O1-LEGACY: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP1_ALLOCA]] to i8* // O1: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP1_ALLOCA]] to i8*
// O1-LEGACY: call void @llvm.lifetime.end.p0i8({{[^,]*}}, i8* %[[P]]) // O1: call void @llvm.lifetime.end.p0i8({{[^,]*}}, i8* %[[P]])
// O1-NEWPM: %[[TMP3:.*]] = bitcast %struct.S* %[[TMP2_ALLOCA]] to i8*
// O1-NEWPM: call void @llvm.lifetime.end.p0i8({{[^,]*}}, i8* nonnull %[[P]])
// //
// O1-LEGACY: call void @foo_int(%struct.S* sret align 4 %[[TMP1_ALLOCA]], // O1: call void @foo_int(%struct.S* sret align 4 %[[TMP1_ALLOCA]],
// O1-NEWPM: call void @foo_int(%struct.S* nonnull sret align 4 %[[TMP1_ALLOCA]],
// O1: call void @llvm.memcpy // O1: call void @llvm.memcpy
// O1-LEGACY: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP1_ALLOCA]] to i8* // O1: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP1_ALLOCA]] to i8*
// O1-LEGACY: call void @llvm.lifetime.end.p0i8({{[^,]*}}, i8* %[[P]]) // O1: call void @llvm.lifetime.end.p0i8({{[^,]*}}, i8* %[[P]])
// O1-NEWPM: call void @llvm.lifetime.end.p0i8({{[^,]*}}, i8* nonnull %[[P]]) // O1: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP2_ALLOCA]] to i8*
// O1-LEGACY: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP2_ALLOCA]] to i8* // O1: call void @llvm.lifetime.start.p0i8({{[^,]*}}, i8* %[[P]])
// O1-LEGACY: call void @llvm.lifetime.start.p0i8({{[^,]*}}, i8* %[[P]]) // O1: call void @foo_int(%struct.S* sret align 4 %[[TMP2_ALLOCA]],
// O1-NEWPM: call void @llvm.lifetime.start.p0i8({{[^,]*}}, i8* nonnull %[[TMP3]])
// O1-LEGACY: call void @foo_int(%struct.S* sret align 4 %[[TMP2_ALLOCA]],
// O1-NEWPM: call void @foo_int(%struct.S* nonnull sret align 4 %[[TMP2_ALLOCA]],
// O1: call void @llvm.memcpy // O1: call void @llvm.memcpy
// O1-LEGACY: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP2_ALLOCA]] to i8* // O1: %[[P:[^ ]+]] = bitcast %struct.S* %[[TMP2_ALLOCA]] to i8*
// O1-LEGACY: call void @llvm.lifetime.end.p0i8({{[^,]*}}, i8* %[[P]]) // O1: call void @llvm.lifetime.end.p0i8({{[^,]*}}, i8* %[[P]])
// O1-NEWPM: call void @llvm.lifetime.end.p0i8({{[^,]*}}, i8* nonnull %[[TMP3]])
r = foo_int(({ r = foo_int(({
if (*j) if (*j)
break; break;
i++; i++;
})); }));
r = foo_int(i++); r = foo_int(i++);
} while (1); } while (1);
return r; return r;
} }