[clang] 42c9354 - Revert "Reland "[LoongArch] Support -march=native and -mtune=""
Steven Wu via cfe-commits
cfe-commits at lists.llvm.org
Mon Jul 31 16:59:34 PDT 2023
Author: Steven Wu
Date: 2023-07-31T16:57:06-07:00
New Revision: 42c9354a928d4d9459504527085fccc91b46aed3
URL: https://github.com/llvm/llvm-project/commit/42c9354a928d4d9459504527085fccc91b46aed3
DIFF: https://github.com/llvm/llvm-project/commit/42c9354a928d4d9459504527085fccc91b46aed3.diff
LOG: Revert "Reland "[LoongArch] Support -march=native and -mtune=""
This reverts commit c56514f21b2cf08eaa7ac3a57ba4ce403a9c8956. This
commit adds global state that is shared between clang driver and clang
cc1, which is not correct when clang is used with `-fno-integrated-cc1`
option (no integrated cc1). The -march and -mtune option needs to be
properly passed through cc1 command-line and stored in TargetInfo.
Added:
Modified:
clang/docs/ReleaseNotes.rst
clang/lib/Basic/Targets/LoongArch.cpp
clang/lib/Basic/Targets/LoongArch.h
clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
clang/lib/Driver/ToolChains/Clang.cpp
clang/test/Preprocessor/init-loongarch.c
llvm/include/llvm/TargetParser/LoongArchTargetParser.h
llvm/lib/Target/LoongArch/LoongArch.td
llvm/lib/TargetParser/LoongArchTargetParser.cpp
Removed:
clang/test/Driver/loongarch-mtune-error.c
clang/test/Driver/loongarch-mtune.c
llvm/test/CodeGen/LoongArch/cpus-invalid.ll
llvm/test/CodeGen/LoongArch/cpus.ll
################################################################################
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 55189cbd659087..a6b70042cc50f9 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -156,9 +156,6 @@ Windows Support
LoongArch Support
^^^^^^^^^^^^^^^^^
-- The ``-march=native`` ``-mtune=`` options and ``__loongarch_{arch,tune}``
- macros are now supported.
-
RISC-V Support
^^^^^^^^^^^^^^
diff --git a/clang/lib/Basic/Targets/LoongArch.cpp b/clang/lib/Basic/Targets/LoongArch.cpp
index f08e5e732b0354..6958479cd7c42d 100644
--- a/clang/lib/Basic/Targets/LoongArch.cpp
+++ b/clang/lib/Basic/Targets/LoongArch.cpp
@@ -15,7 +15,7 @@
#include "clang/Basic/MacroBuilder.h"
#include "clang/Basic/TargetBuiltins.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/TargetParser/LoongArchTargetParser.h"
+#include "llvm/TargetParser/TargetParser.h"
using namespace clang;
using namespace clang::targets;
@@ -198,19 +198,7 @@ void LoongArchTargetInfo::getTargetDefines(const LangOptions &Opts,
else
Builder.defineMacro("__loongarch_frlen", "0");
- // Define __loongarch_arch.
- StringRef Arch = llvm::LoongArch::getArch();
- if (Arch.empty())
- Arch = llvm::LoongArch::getDefaultArch(GRLen == 64);
- if (!Arch.empty())
- Builder.defineMacro("__loongarch_arch", Arch);
-
- // Define __loongarch_tune.
- StringRef TuneCPU = llvm::LoongArch::getTuneCPU();
- if (TuneCPU.empty())
- TuneCPU = Arch;
- if (!TuneCPU.empty())
- Builder.defineMacro("__loongarch_tune", TuneCPU);
+ // TODO: define __loongarch_arch and __loongarch_tune.
StringRef ABI = getABI();
if (ABI == "lp64d" || ABI == "lp64f" || ABI == "lp64s")
@@ -282,12 +270,3 @@ bool LoongArchTargetInfo::handleTargetFeatures(
}
return true;
}
-
-bool LoongArchTargetInfo::isValidTuneCPUName(StringRef Name) const {
- return llvm::LoongArch::isValidTuneCPUName(Name);
-}
-
-void LoongArchTargetInfo::fillValidTuneCPUList(
- SmallVectorImpl<StringRef> &Values) const {
- llvm::LoongArch::fillValidTuneCPUList(Values);
-}
diff --git a/clang/lib/Basic/Targets/LoongArch.h b/clang/lib/Basic/Targets/LoongArch.h
index 60d545566b30fb..52c4ce4253689e 100644
--- a/clang/lib/Basic/Targets/LoongArch.h
+++ b/clang/lib/Basic/Targets/LoongArch.h
@@ -80,9 +80,6 @@ class LLVM_LIBRARY_VISIBILITY LoongArchTargetInfo : public TargetInfo {
const std::vector<std::string> &FeaturesVec) const override;
bool hasFeature(StringRef Feature) const override;
-
- bool isValidTuneCPUName(StringRef Name) const override;
- void fillValidTuneCPUList(SmallVectorImpl<StringRef> &Values) const override;
};
class LLVM_LIBRARY_VISIBILITY LoongArch32TargetInfo
diff --git a/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp b/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
index 6cbb06b9a91f5e..856ad58f3bd9db 100644
--- a/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
@@ -12,7 +12,6 @@
#include "clang/Driver/Driver.h"
#include "clang/Driver/DriverDiagnostic.h"
#include "clang/Driver/Options.h"
-#include "llvm/TargetParser/Host.h"
#include "llvm/TargetParser/LoongArchTargetParser.h"
using namespace clang::driver;
@@ -129,29 +128,21 @@ void loongarch::getLoongArchTargetFeatures(const Driver &D,
std::vector<StringRef> &Features) {
StringRef ArchName;
if (const Arg *A = Args.getLastArg(options::OPT_march_EQ)) {
- ArchName = A->getValue();
-
- // Handle -march=native.
- if (ArchName == "native") {
- ArchName = llvm::sys::getHostCPUName();
- if (ArchName == "generic")
- ArchName = llvm::LoongArch::getDefaultArch(Triple.isLoongArch64());
- }
-
- if (!llvm::LoongArch::isValidArchName(ArchName)) {
+ if (!llvm::LoongArch::isValidArchName(A->getValue())) {
D.Diag(clang::diag::err_drv_invalid_arch_name) << A->getAsString(Args);
return;
}
+ ArchName = A->getValue();
}
+ // TODO: handle -march=native and -mtune=xx.
+
// Select a default arch name.
- if (ArchName.empty())
- ArchName = llvm::LoongArch::getDefaultArch(Triple.isLoongArch64());
+ if (ArchName.empty() && Triple.isLoongArch64())
+ ArchName = "loongarch64";
- if (!ArchName.empty()) {
+ if (!ArchName.empty())
llvm::LoongArch::getArchFeatures(ArchName, Features);
- llvm::LoongArch::setArch(ArchName);
- }
// Select floating-point features determined by -mdouble-float,
// -msingle-float, -msoft-float and -mfpu.
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 170eedf0ac6222..eae3643bd4bf59 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -56,7 +56,6 @@
#include "llvm/Support/YAMLParser.h"
#include "llvm/TargetParser/ARMTargetParserCommon.h"
#include "llvm/TargetParser/Host.h"
-#include "llvm/TargetParser/LoongArchTargetParser.h"
#include "llvm/TargetParser/RISCVTargetParser.h"
#include <cctype>
@@ -1854,25 +1853,10 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
void Clang::AddLoongArchTargetArgs(const ArgList &Args,
ArgStringList &CmdArgs) const {
- const llvm::Triple &Triple = getToolChain().getTriple();
-
CmdArgs.push_back("-target-abi");
- CmdArgs.push_back(
- loongarch::getLoongArchABI(getToolChain().getDriver(), Args, Triple)
- .data());
-
- // Handle -mtune.
- if (const Arg *A = Args.getLastArg(options::OPT_mtune_EQ)) {
- StringRef TuneCPU = A->getValue();
- if (TuneCPU == "native") {
- TuneCPU = llvm::sys::getHostCPUName();
- if (TuneCPU == "generic")
- TuneCPU = llvm::LoongArch::getDefaultArch(Triple.isLoongArch64());
- }
- CmdArgs.push_back("-tune-cpu");
- CmdArgs.push_back(Args.MakeArgString(TuneCPU));
- llvm::LoongArch::setTuneCPU(TuneCPU);
- }
+ CmdArgs.push_back(loongarch::getLoongArchABI(getToolChain().getDriver(), Args,
+ getToolChain().getTriple())
+ .data());
}
void Clang::AddMIPSTargetArgs(const ArgList &Args,
diff --git a/clang/test/Driver/loongarch-mtune-error.c b/clang/test/Driver/loongarch-mtune-error.c
deleted file mode 100644
index a029c3cbf5e115..00000000000000
--- a/clang/test/Driver/loongarch-mtune-error.c
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: not %clang --target=loongarch64 -mtune=invalidcpu -fsyntax-only %s 2>&1 | FileCheck %s
-// RUN: not %clang --target=loongarch64 -mtune=generic -fsyntax-only %s 2>&1 | FileCheck %s
-// RUN: not %clang --target=loongarch64 -mtune=generic-la64 -fsyntax-only %s 2>&1 | FileCheck %s
-
-// CHECK: error: unknown target CPU '{{.*}}'
-// CHECK-NEXT: note: valid target CPU values are: {{.*}}
diff --git a/clang/test/Driver/loongarch-mtune.c b/clang/test/Driver/loongarch-mtune.c
deleted file mode 100644
index a1d17ab4161a8e..00000000000000
--- a/clang/test/Driver/loongarch-mtune.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: %clang --target=loongarch64 -mtune=loongarch64 -fsyntax-only %s -### 2>&1 | \
-// RUN: FileCheck %s --check-prefix=CC1ARG -DCPU=loongarch64
-// RUN: %clang --target=loongarch64 -mtune=loongarch64 -S -emit-llvm %s -o - | \
-// RUN: FileCheck %s --check-prefix=IRATTR -DCPU=loongarch64
-//
-// RUN: %clang --target=loongarch64 -mtune=la464 -fsyntax-only %s -### 2>&1 | \
-// RUN: FileCheck %s --check-prefix=CC1ARG -DCPU=la464
-// RUN: %clang --target=loongarch64 -mtune=la464 -S -emit-llvm %s -o - | \
-// RUN: FileCheck %s --check-prefix=IRATTR -DCPU=la464
-
-// CC1ARG: "-tune-cpu" "[[CPU]]"
-// IRATTR: "tune-cpu"="[[CPU]]"
-
-int foo(void) {
- return 3;
-}
diff --git a/clang/test/Preprocessor/init-loongarch.c b/clang/test/Preprocessor/init-loongarch.c
index c3bc4d6b58dbdc..055431479f2425 100644
--- a/clang/test/Preprocessor/init-loongarch.c
+++ b/clang/test/Preprocessor/init-loongarch.c
@@ -787,23 +787,3 @@
// LA64-FPU0-LP64S: #define __loongarch_lp64 1
// LA64-FPU0-LP64S-NOT: #define __loongarch_single_float
// LA64-FPU0-LP64S: #define __loongarch_soft_float 1
-
-/// Check __loongarch_arch and __loongarch_tune.
-
-// RUN: %clang --target=loongarch64 -x c -E -dM %s -o - | \
-// RUN: FileCheck --match-full-lines --check-prefix=ARCH-TUNE -DARCH=loongarch64 -DTUNE=loongarch64 %s
-// RUN: %clang --target=loongarch64 -x c -E -dM %s -o - -march=loongarch64 | \
-// RUN: FileCheck --match-full-lines --check-prefix=ARCH-TUNE -DARCH=loongarch64 -DTUNE=loongarch64 %s
-// RUN: %clang --target=loongarch64 -x c -E -dM %s -o - -march=la464 | \
-// RUN: FileCheck --match-full-lines --check-prefix=ARCH-TUNE -DARCH=la464 -DTUNE=la464 %s
-// RUN: %clang --target=loongarch64 -x c -E -dM %s -o - -mtune=loongarch64 | \
-// RUN: FileCheck --match-full-lines --check-prefix=ARCH-TUNE -DARCH=loongarch64 -DTUNE=loongarch64 %s
-// RUN: %clang --target=loongarch64 -x c -E -dM %s -o - -mtune=la464 | \
-// RUN: FileCheck --match-full-lines --check-prefix=ARCH-TUNE -DARCH=loongarch64 -DTUNE=la464 %s
-// RUN: %clang --target=loongarch64 -x c -E -dM %s -o - -march=loongarch64 -mtune=la464 | \
-// RUN: FileCheck --match-full-lines --check-prefix=ARCH-TUNE -DARCH=loongarch64 -DTUNE=la464 %s
-// RUN: %clang --target=loongarch64 -x c -E -dM %s -o - -march=la464 -mtune=loongarch64 | \
-// RUN: FileCheck --match-full-lines --check-prefix=ARCH-TUNE -DARCH=la464 -DTUNE=loongarch64 %s
-
-// ARCH-TUNE: #define __loongarch_arch [[ARCH]]
-// ARCH-TUNE: #define __loongarch_tune [[TUNE]]
diff --git a/llvm/include/llvm/TargetParser/LoongArchTargetParser.h b/llvm/include/llvm/TargetParser/LoongArchTargetParser.h
index 82ab064211d769..2aa65ec070ec38 100644
--- a/llvm/include/llvm/TargetParser/LoongArchTargetParser.h
+++ b/llvm/include/llvm/TargetParser/LoongArchTargetParser.h
@@ -66,16 +66,9 @@ struct ArchInfo {
bool isValidArchName(StringRef Arch);
bool getArchFeatures(StringRef Arch, std::vector<StringRef> &Features);
-bool isValidTuneCPUName(StringRef TuneCPU);
-void fillValidTuneCPUList(SmallVectorImpl<StringRef> &Values);
-StringRef getDefaultArch(bool Is64Bit);
-void setArch(StringRef Arch);
-StringRef getArch();
-void setTuneCPU(StringRef TuneCPU);
-StringRef getTuneCPU();
} // namespace LoongArch
} // namespace llvm
-#endif // LLVM_TARGETPARSER_LOONGARCHTARGETPARSER_H
+#endif // LLVM_SUPPORT_LOONGARCHTARGETPARSER_H
diff --git a/llvm/lib/Target/LoongArch/LoongArch.td b/llvm/lib/Target/LoongArch/LoongArch.td
index 0675caa3b60145..7241a5d63526fc 100644
--- a/llvm/lib/Target/LoongArch/LoongArch.td
+++ b/llvm/lib/Target/LoongArch/LoongArch.td
@@ -117,11 +117,6 @@ include "LoongArchInstrInfo.td"
def : ProcessorModel<"generic-la32", NoSchedModel, [Feature32Bit]>;
def : ProcessorModel<"generic-la64", NoSchedModel, [Feature64Bit, FeatureUAL]>;
-// Generic 64-bit processor with double-precision floating-point support.
-def : ProcessorModel<"loongarch64", NoSchedModel, [Feature64Bit,
- FeatureUAL,
- FeatureBasicD]>;
-
// Support generic for compatibility with other targets. The triple will be used
// to change to the appropriate la32/la64 version.
def : ProcessorModel<"generic", NoSchedModel, []>;
diff --git a/llvm/lib/TargetParser/LoongArchTargetParser.cpp b/llvm/lib/TargetParser/LoongArchTargetParser.cpp
index 72781513ff120e..18b04600dbc660 100644
--- a/llvm/lib/TargetParser/LoongArchTargetParser.cpp
+++ b/llvm/lib/TargetParser/LoongArchTargetParser.cpp
@@ -16,9 +16,6 @@
using namespace llvm;
using namespace llvm::LoongArch;
-StringRef Arch;
-StringRef TuneCPU;
-
const FeatureInfo AllFeatures[] = {
#define LOONGARCH_FEATURE(NAME, KIND) {NAME, KIND},
#include "llvm/TargetParser/LoongArchTargetParser.def"
@@ -49,25 +46,3 @@ bool LoongArch::getArchFeatures(StringRef Arch,
}
return false;
}
-
-bool LoongArch::isValidTuneCPUName(StringRef TuneCPU) {
- return isValidArchName(TuneCPU);
-}
-
-void LoongArch::fillValidTuneCPUList(SmallVectorImpl<StringRef> &Values) {
- for (const auto A : AllArchs)
- Values.emplace_back(A.Name);
-}
-
-StringRef LoongArch::getDefaultArch(bool Is64Bit) {
- // TODO: use a real 32-bit arch name.
- return Is64Bit ? "loongarch64" : "";
-}
-
-void LoongArch::setArch(StringRef Name) { Arch = Name; }
-
-StringRef LoongArch::getArch() { return Arch; }
-
-void LoongArch::setTuneCPU(StringRef Name) { TuneCPU = Name; }
-
-StringRef LoongArch::getTuneCPU() { return TuneCPU; }
diff --git a/llvm/test/CodeGen/LoongArch/cpus-invalid.ll b/llvm/test/CodeGen/LoongArch/cpus-invalid.ll
deleted file mode 100644
index b5435fb9050066..00000000000000
--- a/llvm/test/CodeGen/LoongArch/cpus-invalid.ll
+++ /dev/null
@@ -1,7 +0,0 @@
-; RUN: llc < %s --mtriple=loongarch64 --mattr=+64bit --mcpu=invalidcpu 2>&1 | FileCheck %s
-
-; CHECK: {{.*}} is not a recognized processor for this target
-
-define void @f() {
- ret void
-}
diff --git a/llvm/test/CodeGen/LoongArch/cpus.ll b/llvm/test/CodeGen/LoongArch/cpus.ll
deleted file mode 100644
index 35945ae4de71fb..00000000000000
--- a/llvm/test/CodeGen/LoongArch/cpus.ll
+++ /dev/null
@@ -1,20 +0,0 @@
-;; This tests that llc accepts all valid LoongArch CPUs.
-;; Note the 'generic' names have been tested in cpu-name-generic.ll.
-
-; RUN: llc < %s --mtriple=loongarch64 --mcpu=loongarch64 2>&1 | FileCheck %s
-; RUN: llc < %s --mtriple=loongarch64 --mcpu=la464 2>&1 | FileCheck %s
-; RUN: llc < %s --mtriple=loongarch64 2>&1 | FileCheck %s
-
-; CHECK-NOT: {{.*}} is not a recognized processor for this target
-
-define void @f() {
- ret void
-}
-
-define void @tune_cpu_loongarch64() "tune-cpu"="loongarch64" {
- ret void
-}
-
-define void @tune_cpu_la464() "tune-cpu"="la464" {
- ret void
-}
More information about the cfe-commits
mailing list