diff options
4 files changed, 0 insertions, 42 deletions
diff --git a/dex2oat/linker/arm64/relative_patcher_arm64_test.cc b/dex2oat/linker/arm64/relative_patcher_arm64_test.cc index 9e91c6568a..678574be29 100644 --- a/dex2oat/linker/arm64/relative_patcher_arm64_test.cc +++ b/dex2oat/linker/arm64/relative_patcher_arm64_test.cc @@ -575,11 +575,6 @@ class Arm64RelativePatcherTestDefault : public Arm64RelativePatcherTest { Arm64RelativePatcherTestDefault() : Arm64RelativePatcherTest("default") { } }; -class Arm64RelativePatcherTestDenver64 : public Arm64RelativePatcherTest { - public: - Arm64RelativePatcherTestDenver64() : Arm64RelativePatcherTest("denver64") { } -}; - TEST_F(Arm64RelativePatcherTestDefault, CallSelf) { const LinkerPatch patches[] = { LinkerPatch::RelativeCodePatch(0u, nullptr, 1u), @@ -834,18 +829,6 @@ TEST_F(Arm64RelativePatcherTestDefault, StringBssEntryLdur) { { 0x1234u, 0x1238u }); } -TEST_F(Arm64RelativePatcherTestDenver64, StringBssEntryLdur) { - TestForAdrpOffsets( - [&](uint32_t adrp_offset, uint32_t string_entry_offset) { - Reset(); - TestAdrpLdurLdr(adrp_offset, - /*has_thunk=*/ false, - /*bss_begin=*/ 0x12345678u, - string_entry_offset); - }, - { 0x1234u, 0x1238u }); -} - // LDR <Wt>, <label> is always aligned. We should never have to use a fixup. TEST_F(Arm64RelativePatcherTestDefault, StringBssEntryWPcRel) { TestForAdrpOffsets( @@ -917,15 +900,6 @@ TEST_F(Arm64RelativePatcherTestDefault, StringReferenceLdur) { { 0x12345678u, 0xffffc840u }); } -TEST_F(Arm64RelativePatcherTestDenver64, StringReferenceLdur) { - TestForAdrpOffsets( - [&](uint32_t adrp_offset, uint32_t string_offset) { - Reset(); - TestAdrpLdurAdd(adrp_offset, /*has_thunk=*/ false, string_offset); - }, - { 0x12345678u, 0xffffc840U }); -} - TEST_F(Arm64RelativePatcherTestDefault, StringReferenceSubX3X2) { TestForAdrpOffsets( [&](uint32_t adrp_offset, uint32_t string_offset) { diff --git a/runtime/arch/arm/instruction_set_features_arm.cc b/runtime/arch/arm/instruction_set_features_arm.cc index 58ae394fb4..fcf3c756fb 100644 --- a/runtime/arch/arm/instruction_set_features_arm.cc +++ b/runtime/arch/arm/instruction_set_features_arm.cc @@ -53,7 +53,6 @@ ArmFeaturesUniquePtr ArmInstructionSetFeatures::FromVariant( "cortex-a75", "cortex-a76", "exynos-m1", - "denver", "kryo", "kryo385", }; diff --git a/runtime/arch/arm/instruction_set_features_arm_test.cc b/runtime/arch/arm/instruction_set_features_arm_test.cc index d9651f9088..36e31bdca4 100644 --- a/runtime/arch/arm/instruction_set_features_arm_test.cc +++ b/runtime/arch/arm/instruction_set_features_arm_test.cc @@ -46,20 +46,6 @@ TEST(ArmInstructionSetFeaturesTest, ArmFeaturesFromVariant) { EXPECT_STREQ("div,atomic_ldrd_strd,armv8a", kryo_features->GetFeatureString().c_str()); EXPECT_EQ(kryo_features->AsBitmap(), 7U); - // Build features for a 32-bit ARM denver processor. - std::unique_ptr<const InstructionSetFeatures> denver_features( - InstructionSetFeatures::FromVariant(InstructionSet::kArm, "denver", &error_msg)); - ASSERT_TRUE(denver_features.get() != nullptr) << error_msg; - - EXPECT_TRUE(denver_features->Equals(denver_features.get())); - EXPECT_TRUE(denver_features->HasAtLeast(krait_features.get())); - EXPECT_FALSE(krait_features->Equals(denver_features.get())); - EXPECT_FALSE(krait_features->HasAtLeast(denver_features.get())); - EXPECT_TRUE(denver_features->AsArmInstructionSetFeatures()->HasDivideInstruction()); - EXPECT_TRUE(denver_features->AsArmInstructionSetFeatures()->HasAtomicLdrdAndStrd()); - EXPECT_STREQ("div,atomic_ldrd_strd,armv8a", denver_features->GetFeatureString().c_str()); - EXPECT_EQ(denver_features->AsBitmap(), 7U); - // Build features for a 32-bit ARMv7 processor. std::unique_ptr<const InstructionSetFeatures> generic_features( InstructionSetFeatures::FromVariant(InstructionSet::kArm, "generic", &error_msg)); diff --git a/runtime/arch/arm64/instruction_set_features_arm64.cc b/runtime/arch/arm64/instruction_set_features_arm64.cc index 963c207842..4a2b9d59e8 100644 --- a/runtime/arch/arm64/instruction_set_features_arm64.cc +++ b/runtime/arch/arm64/instruction_set_features_arm64.cc @@ -126,7 +126,6 @@ Arm64FeaturesUniquePtr Arm64InstructionSetFeatures::FromVariant( "exynos-m1", "exynos-m2", "exynos-m3", - "denver64", "kryo", "kryo385", }; |