This is an archive of the discontinued LLVM Phabricator instance.

Differential D80835

[AIX] Change the default target CPU to power4 for AIX on Power
ClosedPublic

Authored by stevewan on May 29 2020, 12:59 PM.

Details

Reviewers
hubert.reinterpretcast
cebowleratibm
daltenty
Commits
rGba4afe6f7a84: [AIX] Change the default target CPU to power4 for AIX on Power
Summary

This patch changes the AIX default target CPU to power4 since this is the the lowest arch for the lowest OS level supported.

Diff Detail

Event Timeline

stevewan created this revision.May 29 2020, 12:59 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 29 2020, 12:59 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
stevewan added reviewers: hubert.reinterpretcast, cebowleratibm, daltenty.May 29 2020, 1:01 PM
Harbormaster failed remote builds in B58485: Diff 267343!May 29 2020, 1:41 PM
Harbormaster completed remote builds in B58485: Diff 267343.May 29 2020, 11:25 PM
hubert.reinterpretcast accepted this revision.Jun 2 2020, 9:01 PM

LGTM; thanks.

clang/lib/Driver/ToolChains/CommonArgs.cpp
301

A separate patch may be in order for changing this to take the non-Darwin path without checking.

This revision is now accepted and ready to land.Jun 2 2020, 9:01 PM
Closed by commit rGba4afe6f7a84: [AIX] Change the default target CPU to power4 for AIX on Power (authored by stevewan). · Explain WhyJun 3 2020, 10:58 AM
This revision was automatically updated to reflect the committed changes.
stevewan marked an inline comment as done.Jun 3 2020, 1:02 PM
stevewan marked an inline comment as done.
stevewan added inline comments.
clang/lib/Driver/ToolChains/CommonArgs.cpp
301

A separate patch created here, https://reviews.llvm.org/D81115.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
20 lines
test/
Driver/
16 lines

Diff 267343

clang/lib/Driver/ToolChains/CommonArgs.cpp

Show First 20 Lines • Show All 288 Lines • ▼ Show 20 Lines case llvm::Triple::nvptx64:
return ""; return "";
case llvm::Triple::ppc: case llvm::Triple::ppc:
case llvm::Triple::ppc64: case llvm::Triple::ppc64:
case llvm::Triple::ppc64le: { case llvm::Triple::ppc64le: {
std::string TargetCPUName = ppc::getPPCTargetCPU(Args); std::string TargetCPUName = ppc::getPPCTargetCPU(Args);
// LLVM may default to generating code for the native CPU, // LLVM may default to generating code for the native CPU,
// but, like gcc, we default to a more generic option for // but, like gcc, we default to a more generic option for
// each architecture. (except on Darwin) // each architecture. (except on AIX or Darwin)
if (TargetCPUName.empty() && !T.isOSDarwin()) { if (TargetCPUName.empty()) {
if (T.isOSAIX())
TargetCPUName = "pwr4";
else if (!T.isOSDarwin()) {
hubert.reinterpretcastUnsubmitted
Done
ReplyInline Actions

A separate patch may be in order for changing this to take the non-Darwin path without checking.

hubert.reinterpretcast: A separate patch may be in order for changing this to take the non-Darwin path without checking.
stevewanAuthorUnsubmitted
Done
ReplyInline Actions

A separate patch created here, https://reviews.llvm.org/D81115.

stevewan: A separate patch created here, https://reviews.llvm.org/D81115.
if (T.getArch() == llvm::Triple::ppc64) if (T.getArch() == llvm::Triple::ppc64)
TargetCPUName = "ppc64"; TargetCPUName = "ppc64";
else if (T.getArch() == llvm::Triple::ppc64le) else if (T.getArch() == llvm::Triple::ppc64le)
TargetCPUName = "ppc64le"; TargetCPUName = "ppc64le";
else else
TargetCPUName = "ppc"; TargetCPUName = "ppc";
} }
}
return TargetCPUName; return TargetCPUName;
} }
case llvm::Triple::bpfel: case llvm::Triple::bpfel:
case llvm::Triple::bpfeb: case llvm::Triple::bpfeb:
case llvm::Triple::sparc: case llvm::Triple::sparc:
case llvm::Triple::sparcel: case llvm::Triple::sparcel:
case llvm::Triple::sparcv9: case llvm::Triple::sparcv9:
▲ Show 20 Lines • Show All 1,112 Lines • Show Last 20 Lines

clang/test/Driver/aix-mcpu-default.c

  • This file was added.
// Check that the target cpu defaults to power4 on AIX.
// RUN: %clang -no-canonical-prefixes %s -### -c 2>&1 \
// RUN: -target powerpc-ibm-aix \
// RUN: | FileCheck --check-prefix=CHECK-MCPU-DEFAULT %s
// CHECK-MCPU-DEFAULT-NOT: warning:
// CHECK-MCPU-DEFAULT: {{.*}}clang{{.*}}" "-cc1"
// CHECK-MCPU-DEFAULT: "-target-cpu" "pwr4"
// Check that the user is able to overwrite the default with '-mcpu'.
// RUN: %clang -no-canonical-prefixes %s -### -c 2>&1 \
// RUN: -mcpu=pwr6 \
// RUN: -target powerpc-ibm-aix \
// RUN: | FileCheck --check-prefix=CHECK-MCPU-USER %s
// CHECK-MCPU-USER-NOT: warning:
// CHECK-MCPU-USER: {{.*}}clang{{.*}}" "-cc1"
// CHECK-MCPU-USER: "-target-cpu" "pwr6"