[clang] 8cfe9d8 - [Driver] Remove remnant myriad pieces after Myriad.cpp removal
Fangrui Song via cfe-commits
cfe-commits at lists.llvm.org
Fri Aug 25 13:29:15 PDT 2023
Author: Fangrui Song
Date: 2023-08-25T13:29:10-07:00
New Revision: 8cfe9d8f2ad3a52ba7fd5841d3939aa810536e16
URL: https://github.com/llvm/llvm-project/commit/8cfe9d8f2ad3a52ba7fd5841d3939aa810536e16
DIFF: https://github.com/llvm/llvm-project/commit/8cfe9d8f2ad3a52ba7fd5841d3939aa810536e16.diff
LOG: [Driver] Remove remnant myriad pieces after Myriad.cpp removal
after D104279 and D158706.
Added:
Modified:
clang/lib/Basic/Targets/Sparc.cpp
clang/lib/Driver/ToolChains/Arch/Sparc.cpp
clang/test/Driver/sparc-as.c
clang/test/Misc/target-invalid-cpu-note.c
clang/test/Preprocessor/predefined-arch-macros.c
Removed:
################################################################################
diff --git a/clang/lib/Basic/Targets/Sparc.cpp b/clang/lib/Basic/Targets/Sparc.cpp
index 4548902ca12b9e..8b9e14cccc9037 100644
--- a/clang/lib/Basic/Targets/Sparc.cpp
+++ b/clang/lib/Basic/Targets/Sparc.cpp
@@ -93,12 +93,6 @@ static constexpr SparcCPUInfo CPUInfo[] = {
{{"ma2480"}, SparcTargetInfo::CK_MYRIAD2480, SparcTargetInfo::CG_V8},
{{"ma2485"}, SparcTargetInfo::CK_MYRIAD2485, SparcTargetInfo::CG_V8},
{{"ma2x8x"}, SparcTargetInfo::CK_MYRIAD2x8x, SparcTargetInfo::CG_V8},
- // FIXME: the myriad2[.n] spellings are obsolete,
- // but a grace period is needed to allow updating dependent builds.
- {{"myriad2"}, SparcTargetInfo::CK_MYRIAD2x5x, SparcTargetInfo::CG_V8},
- {{"myriad2.1"}, SparcTargetInfo::CK_MYRIAD2100, SparcTargetInfo::CG_V8},
- {{"myriad2.2"}, SparcTargetInfo::CK_MYRIAD2x5x, SparcTargetInfo::CG_V8},
- {{"myriad2.3"}, SparcTargetInfo::CK_MYRIAD2x8x, SparcTargetInfo::CG_V8},
{{"leon2"}, SparcTargetInfo::CK_LEON2, SparcTargetInfo::CG_V8},
{{"at697e"}, SparcTargetInfo::CK_LEON2_AT697E, SparcTargetInfo::CG_V8},
{{"at697f"}, SparcTargetInfo::CK_LEON2_AT697F, SparcTargetInfo::CG_V8},
@@ -160,72 +154,6 @@ void SparcV8TargetInfo::getTargetDefines(const LangOptions &Opts,
break;
}
}
- if (getTriple().getVendor() == llvm::Triple::Myriad) {
- std::string MyriadArchValue, Myriad2Value;
- Builder.defineMacro("__sparc_v8__");
- Builder.defineMacro("__leon__");
- switch (CPU) {
- case CK_MYRIAD2100:
- MyriadArchValue = "__ma2100";
- Myriad2Value = "1";
- break;
- case CK_MYRIAD2150:
- MyriadArchValue = "__ma2150";
- Myriad2Value = "2";
- break;
- case CK_MYRIAD2155:
- MyriadArchValue = "__ma2155";
- Myriad2Value = "2";
- break;
- case CK_MYRIAD2450:
- MyriadArchValue = "__ma2450";
- Myriad2Value = "2";
- break;
- case CK_MYRIAD2455:
- MyriadArchValue = "__ma2455";
- Myriad2Value = "2";
- break;
- case CK_MYRIAD2x5x:
- Myriad2Value = "2";
- break;
- case CK_MYRIAD2080:
- MyriadArchValue = "__ma2080";
- Myriad2Value = "3";
- break;
- case CK_MYRIAD2085:
- MyriadArchValue = "__ma2085";
- Myriad2Value = "3";
- break;
- case CK_MYRIAD2480:
- MyriadArchValue = "__ma2480";
- Myriad2Value = "3";
- break;
- case CK_MYRIAD2485:
- MyriadArchValue = "__ma2485";
- Myriad2Value = "3";
- break;
- case CK_MYRIAD2x8x:
- Myriad2Value = "3";
- break;
- default:
- MyriadArchValue = "__ma2100";
- Myriad2Value = "1";
- break;
- }
- if (!MyriadArchValue.empty()) {
- Builder.defineMacro(MyriadArchValue, "1");
- Builder.defineMacro(MyriadArchValue + "__", "1");
- }
- if (Myriad2Value == "2") {
- Builder.defineMacro("__ma2x5x", "1");
- Builder.defineMacro("__ma2x5x__", "1");
- } else if (Myriad2Value == "3") {
- Builder.defineMacro("__ma2x8x", "1");
- Builder.defineMacro("__ma2x8x__", "1");
- }
- Builder.defineMacro("__myriad2__", Myriad2Value);
- Builder.defineMacro("__myriad2", Myriad2Value);
- }
if (getCPUGeneration(CPU) == CG_V9) {
Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1");
Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2");
diff --git a/clang/lib/Driver/ToolChains/Arch/Sparc.cpp b/clang/lib/Driver/ToolChains/Arch/Sparc.cpp
index 11c9444fde2b17..22e583021515e5 100644
--- a/clang/lib/Driver/ToolChains/Arch/Sparc.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/Sparc.cpp
@@ -63,10 +63,6 @@ const char *sparc::getSparcAsmModeForCPU(StringRef Name,
.Case("ma2480", "-Aleon")
.Case("ma2485", "-Aleon")
.Case("ma2x8x", "-Aleon")
- .Case("myriad2", "-Aleon")
- .Case("myriad2.1", "-Aleon")
- .Case("myriad2.2", "-Aleon")
- .Case("myriad2.3", "-Aleon")
.Case("leon2", "-Av8")
.Case("at697e", "-Av8")
.Case("at697f", "-Av8")
diff --git a/clang/test/Driver/sparc-as.c b/clang/test/Driver/sparc-as.c
index dca78f52fc9a18..30b685434de200 100644
--- a/clang/test/Driver/sparc-as.c
+++ b/clang/test/Driver/sparc-as.c
@@ -120,22 +120,6 @@
// RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree -### %s 2>&1 \
// RUN: | FileCheck -check-prefix=SPARC-LEON %s
-// RUN: %clang -mcpu=myriad2 --target=sparc \
-// RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree -### %s 2>&1 \
-// RUN: | FileCheck -check-prefix=SPARC-LEON %s
-
-// RUN: %clang -mcpu=myriad2.1 --target=sparc \
-// RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree -### %s 2>&1 \
-// RUN: | FileCheck -check-prefix=SPARC-LEON %s
-
-// RUN: %clang -mcpu=myriad2.2 --target=sparc \
-// RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree -### %s 2>&1 \
-// RUN: | FileCheck -check-prefix=SPARC-LEON %s
-
-// RUN: %clang -mcpu=myriad2.3 --target=sparc \
-// RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree -### %s 2>&1 \
-// RUN: | FileCheck -check-prefix=SPARC-LEON %s
-
// RUN: %clang -mcpu=leon2 --target=sparc \
// RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree -### %s 2>&1 \
// RUN: | FileCheck -check-prefix=SPARC-V8 %s
diff --git a/clang/test/Misc/target-invalid-cpu-note.c b/clang/test/Misc/target-invalid-cpu-note.c
index be766a1500e6bf..c44bd6087af413 100644
--- a/clang/test/Misc/target-invalid-cpu-note.c
+++ b/clang/test/Misc/target-invalid-cpu-note.c
@@ -49,7 +49,7 @@
// RUN: not %clang_cc1 -triple sparc--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix SPARC
// SPARC: error: unknown target CPU 'not-a-cpu'
-// SPARC-NEXT: note: valid target CPU values are: v8, supersparc, sparclite, f934, hypersparc, sparclite86x, sparclet, tsc701, v9, ultrasparc, ultrasparc3, niagara, niagara2, niagara3, niagara4, ma2100, ma2150, ma2155, ma2450, ma2455, ma2x5x, ma2080, ma2085, ma2480, ma2485, ma2x8x, myriad2, myriad2.1, myriad2.2, myriad2.3, leon2, at697e, at697f, leon3, ut699, gr712rc, leon4, gr740{{$}}
+// SPARC-NEXT: note: valid target CPU values are: v8, supersparc, sparclite, f934, hypersparc, sparclite86x, sparclet, tsc701, v9, ultrasparc, ultrasparc3, niagara, niagara2, niagara3, niagara4, ma2100, ma2150, ma2155, ma2450, ma2455, ma2x5x, ma2080, ma2085, ma2480, ma2485, ma2x8x, leon2, at697e, at697f, leon3, ut699, gr712rc, leon4, gr740{{$}}
// RUN: not %clang_cc1 -triple sparcv9--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix SPARCV9
// SPARCV9: error: unknown target CPU 'not-a-cpu'
diff --git a/clang/test/Preprocessor/predefined-arch-macros.c b/clang/test/Preprocessor/predefined-arch-macros.c
index b87bada61e9706..5bb4edb218ec20 100644
--- a/clang/test/Preprocessor/predefined-arch-macros.c
+++ b/clang/test/Preprocessor/predefined-arch-macros.c
@@ -4055,66 +4055,9 @@
// RUN: %clang -E -dM %s -o - 2>&1 \
// RUN: -target sparcel-unknown-linux \
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARCEL
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2.1 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-1 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2.2 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2.3 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2100 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-1 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2150 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2155 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2450 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2455 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2x5x 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2080 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2085 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2480 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2485 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
-// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2x8x 2>&1 \
-// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \
-// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2
// CHECK_SPARCEL: #define __LITTLE_ENDIAN__ 1
-// CHECK_MYRIAD2: #define __leon__ 1
-// CHECK_MYRIAD2-1: #define __myriad2 1
-// CHECK_MYRIAD2-1: #define __myriad2__ 1
-// CHECK_MYRIAD2-2: #define __ma2x5x 1
-// CHECK_MYRIAD2-2: #define __ma2x5x__ 1
-// CHECK_MYRIAD2-2: #define __myriad2 2
-// CHECK_MYRIAD2-2: #define __myriad2__ 2
-// CHECK_MYRIAD2-3: #define __ma2x8x 1
-// CHECK_MYRIAD2-3: #define __ma2x8x__ 1
-// CHECK_MYRIAD2-3: #define __myriad2 3
-// CHECK_MYRIAD2-3: #define __myriad2__ 3
// CHECK_SPARCEL: #define __sparc 1
// CHECK_SPARCEL: #define __sparc__ 1
-// CHECK_MYRIAD2: #define __sparc_v8__ 1
// CHECK_SPARCEL: #define __sparcv8 1
// RUN: %clang -E -dM %s -o - 2>&1 \
More information about the cfe-commits
mailing list