diff options
| -rw-r--r-- | llvm/lib/Support/TargetParser.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/ARM/ARM.td | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp | 10 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Thumb2/thumb2-smla.ll | 4 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Thumb2/thumb2-smul.ll | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/llvm/lib/Support/TargetParser.cpp b/llvm/lib/Support/TargetParser.cpp index 1ae63e2cec5..7a870775ee4 100644 --- a/llvm/lib/Support/TargetParser.cpp +++ b/llvm/lib/Support/TargetParser.cpp @@ -190,9 +190,9 @@ bool llvm::ARM::getExtensionFeatures(unsigned Extensions, Features.push_back("-crc"); if (Extensions & ARM::AEK_DSP) - Features.push_back("+t2dsp"); + Features.push_back("+dsp"); else - Features.push_back("-t2dsp"); + Features.push_back("-dsp"); return getHWDivFeatures(Extensions, Features); } diff --git a/llvm/lib/Target/ARM/ARM.td b/llvm/lib/Target/ARM/ARM.td index dcfadc30eb6..26415be1446 100644 --- a/llvm/lib/Target/ARM/ARM.td +++ b/llvm/lib/Target/ARM/ARM.td @@ -119,8 +119,8 @@ def FeatureAvoidMOVsShOp : SubtargetFeature<"avoid-movs-shop", def FeatureHasRAS : SubtargetFeature<"ras", "HasRAS", "true", "Has return address stack">; -/// DSP extension (called "t2dsp" for backwards compatibility only). -def FeatureDSP : SubtargetFeature<"t2dsp", "HasDSP", "true", +/// DSP extension. +def FeatureDSP : SubtargetFeature<"dsp", "HasDSP", "true", "Supports DSP instructions in ARM and/or Thumb2">; // Multiprocessing extension. diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp index 559cb2b5c93..79d9cef06ac 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp @@ -144,7 +144,7 @@ std::string ARM_MC::ParseARMTriple(const Triple &TT, StringRef CPU) { // v8a: FeatureDB, FeatureFPARMv8, FeatureNEON, FeatureDSP, // FeatureMP, FeatureHWDiv, FeatureHWDivARM, FeatureTrustZone, // FeatureT2XtPk, FeatureCrypto, FeatureCRC - ARMArchFeature = "+v8,+db,+fp-armv8,+neon,+t2dsp,+mp,+hwdiv,+hwdiv-arm," + ARMArchFeature = "+v8,+db,+fp-armv8,+neon,+dsp,+mp,+hwdiv,+hwdiv-arm," "+trustzone,+t2xtpk,+crypto,+crc"; else // Use CPU to figure out the exact features @@ -155,7 +155,7 @@ std::string ARM_MC::ParseARMTriple(const Triple &TT, StringRef CPU) { // v8.1a: FeatureDB, FeatureFPARMv8, FeatureNEON, FeatureDSP, // FeatureMP, FeatureHWDiv, FeatureHWDivARM, FeatureTrustZone, // FeatureT2XtPk, FeatureCrypto, FeatureCRC, FeatureV8_1a - ARMArchFeature = "+v8.1a,+db,+fp-armv8,+neon,+t2dsp,+mp,+hwdiv,+hwdiv-arm," + ARMArchFeature = "+v8.1a,+db,+fp-armv8,+neon,+dsp,+mp,+hwdiv,+hwdiv-arm," "+trustzone,+t2xtpk,+crypto,+crc"; else // Use CPU to figure out the exact features @@ -174,7 +174,7 @@ std::string ARM_MC::ParseARMTriple(const Triple &TT, StringRef CPU) { if (NoCPU) // v7em: FeatureNoARM, FeatureDB, FeatureHWDiv, FeatureDSP, // FeatureT2XtPk, FeatureMClass - ARMArchFeature = "+v7,+noarm,+db,+hwdiv,+t2dsp,+t2xtpk,+mclass"; + ARMArchFeature = "+v7,+noarm,+db,+hwdiv,+dsp,+t2xtpk,+mclass"; else // Use CPU to figure out the exact features. ARMArchFeature = "+v7"; @@ -183,7 +183,7 @@ std::string ARM_MC::ParseARMTriple(const Triple &TT, StringRef CPU) { if (NoCPU) // v7s: FeatureNEON, FeatureDB, FeatureDSP, FeatureHasRAS // Swift - ARMArchFeature = "+v7,+swift,+neon,+db,+t2dsp,+ras"; + ARMArchFeature = "+v7,+swift,+neon,+db,+dsp,+ras"; else // Use CPU to figure out the exact features. ARMArchFeature = "+v7"; @@ -195,7 +195,7 @@ std::string ARM_MC::ParseARMTriple(const Triple &TT, StringRef CPU) { // features. if (NoCPU) // v7a: FeatureNEON, FeatureDB, FeatureDSP, FeatureT2XtPk - ARMArchFeature = "+v7,+neon,+db,+t2dsp,+t2xtpk"; + ARMArchFeature = "+v7,+neon,+db,+dsp,+t2xtpk"; else // Use CPU to figure out the exact features. ARMArchFeature = "+v7"; diff --git a/llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll b/llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll index db9b644d4f9..273abb8a7b0 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2dsp %s -o - | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+dsp %s -o - | FileCheck %s define i32 @smulhi(i32 %x, i32 %y) { ; CHECK: smulhi diff --git a/llvm/test/CodeGen/Thumb2/thumb2-smla.ll b/llvm/test/CodeGen/Thumb2/thumb2-smla.ll index 8573d39f09f..5ddaf9353f9 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-smla.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-smla.ll @@ -1,5 +1,5 @@ -; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+t2dsp %s -o - | FileCheck %s -; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+t2dsp -arm-use-mulops=false %s -o - | FileCheck %s -check-prefix=NO_MULOPS +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+dsp %s -o - | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+dsp -arm-use-mulops=false %s -o - | FileCheck %s -check-prefix=NO_MULOPS define i32 @f3(i32 %a, i16 %x, i32 %y) { ; CHECK: f3 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-smul.ll b/llvm/test/CodeGen/Thumb2/thumb2-smul.ll index 937f7737f2b..a196a3c79ae 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-smul.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-smul.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+t2dsp %s -o - | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+dsp %s -o - | FileCheck %s @x = weak global i16 0 ; <i16*> [#uses=1] @y = weak global i16 0 ; <i16*> [#uses=0] |
