[llvm] 5f4d383 - [clang][ARM] Remove non-existent arm1136jz-s CPU

[David Spickett via llvm-commits]

Author: David Spickett
Date: 2021-05-25T08:54:59Z
New Revision: 5f4d383a59351711d4f64cbb6a04ef9ffc0d8f88

URL: https://github.com/llvm/llvm-project/commit/5f4d383a59351711d4f64cbb6a04ef9ffc0d8f88
DIFF: https://github.com/llvm/llvm-project/commit/5f4d383a59351711d4f64cbb6a04ef9ffc0d8f88.diff

LOG: [clang][ARM] Remove non-existent arm1136jz-s CPU

There is an ARM1136JF-S and an ARM1136J-S but I could find
no references to an ARM1136JZ-S. In CPU manuals or the manual
for Arm Compiler 5.

See:
https://developer.arm.com/documentation/ddi0211/latest/
https://developer.arm.com/documentation/dui0472/latest/

Using this CPU you get:
$ ./bin/clang --target=arm-linux-gnueabihf -march=armv3m -mcpu=arm1136jz-s -c /tmp/test.c -o /tmp/test.o
'arm1136jz-s' is not a recognized processor for this target (ignoring processor)

Since the llvm target does not know what it is.

This is part of fixing https://bugs.llvm.org/show_bug.cgi?id=50454.

Reviewed By: peter.smith

Differential Revision: https://reviews.llvm.org/D103019

Added: 
    

Modified: 
    llvm/include/llvm/Support/ARMTargetParser.def
    llvm/unittests/Support/TargetParserTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Support/ARMTargetParser.def b/llvm/include/llvm/Support/ARMTargetParser.def
index a67ca7182acb8..691b209757c77 100644
--- a/llvm/include/llvm/Support/ARMTargetParser.def
+++ b/llvm/include/llvm/Support/ARMTargetParser.def
@@ -235,7 +235,6 @@ ARM_CPU_NAME("arm1022e", ARMV5TE, FK_NONE, true, ARM::AEK_NONE)
 ARM_CPU_NAME("arm926ej-s", ARMV5TEJ, FK_NONE, true, ARM::AEK_NONE)
 ARM_CPU_NAME("arm1136j-s", ARMV6, FK_NONE, false, ARM::AEK_NONE)
 ARM_CPU_NAME("arm1136jf-s", ARMV6, FK_VFPV2, true, ARM::AEK_NONE)
-ARM_CPU_NAME("arm1136jz-s", ARMV6, FK_NONE, false, ARM::AEK_NONE)
 ARM_CPU_NAME("mpcore", ARMV6K, FK_VFPV2, true, ARM::AEK_NONE)
 ARM_CPU_NAME("mpcorenovfp", ARMV6K, FK_NONE, false, ARM::AEK_NONE)
 ARM_CPU_NAME("arm1176jz-s", ARMV6KZ, FK_NONE, false, ARM::AEK_NONE)

diff  --git a/llvm/unittests/Support/TargetParserTest.cpp b/llvm/unittests/Support/TargetParserTest.cpp
index 0d4fd08b7fce1..86285dbd49ccf 100644
--- a/llvm/unittests/Support/TargetParserTest.cpp
+++ b/llvm/unittests/Support/TargetParserTest.cpp
@@ -168,8 +168,6 @@ INSTANTIATE_TEST_SUITE_P(
                          ARM::AEK_NONE | ARM::AEK_DSP, "6"),
         ARMCPUTestParams("arm1136jf-s", "armv6", "vfpv2",
                          ARM::AEK_NONE | ARM::AEK_DSP, "6"),
-        ARMCPUTestParams("arm1136jz-s", "armv6", "none",
-                         ARM::AEK_NONE | ARM::AEK_DSP, "6"),
         ARMCPUTestParams("arm1176jz-s", "armv6kz", "none",
                          ARM::AEK_NONE | ARM::AEK_SEC | ARM::AEK_DSP, "6KZ"),
         ARMCPUTestParams("mpcore", "armv6k", "vfpv2",
@@ -391,7 +389,7 @@ INSTANTIATE_TEST_SUITE_P(
                          ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP,
                          "7-S")));
 
-static constexpr unsigned NumARMCPUArchs = 92;
+static constexpr unsigned NumARMCPUArchs = 91;
 
 TEST(TargetParserTest, testARMCPUArchList) {
   SmallVector<StringRef, NumARMCPUArchs> List;