Revert "Integer.bitCount and Long.bitCount intrinsics for ARM"

Fails 564:

[ 80% 771/967] build test-art-target-run-test-debug-prebuild-optimizing-relocate-ntrace-cms-checkjni-image-npictest-ndebuggable-564-checker-bitcount32
checker exit status: 1
/b/build/slave/hammerhead-debug/build/art/test/564-checker-bitcount: FAILED!
 
#################### info
# Unit test for 32-bit and 64-bit bit count operation.
#################### diffs
--- expected.txt	2016-06-08 02:57:45.570840797 -0700
+++ output.txt	2016-06-29 09:45:45.813173505 -0700
@@ -1 +1,3 @@
 passed
+error: Test case not found in the CFG file
+Main.java:32: int Main.$noinline$BitCountByte(byte) intrinsics_recognition (after)
####################
 
564-checker-bitcount files deleted from host 
and from target
test-art-target-run-test-debug-prebuild-optimizing-relocate-ntrace-cms-checkjni-image-npictest-ndebuggable-564-checker-bitcount32 FAILED

This reverts commit 2a17419c2e54f8ada0df56daa379c78f8ae8a9e8.

Change-Id: I263cfc09ebf78956cd1e86a0bb59ba1b36ffeafe

1 files changed, 2 insertions, 44 deletions

diff --git a/compiler/optimizing/intrinsics_arm.cc b/compiler/optimizing/intrinsics_arm.cc
index 19629b171f..f43f8edf06 100644
--- a/compiler/optimizing/intrinsics_arm.cc
+++ b/compiler/optimizing/intrinsics_arm.cc
@@ -1976,50 +1976,6 @@ void IntrinsicCodeGeneratorARM::VisitShortReverseBytes(HInvoke* invoke) {
   __ revsh(out, in);
 }
 
-static void GenBitCount(HInvoke* instr, bool is64bit, ArmAssembler* assembler) {
-  DCHECK(instr->GetType() == Primitive::kPrimInt);
-  DCHECK((is64bit && instr->InputAt(0)->GetType() == Primitive::kPrimLong) ||
-         (!is64bit && instr->InputAt(0)->GetType() == Primitive::kPrimInt));
-
-  LocationSummary* locations = instr->GetLocations();
-  Location     in = locations->InAt(0);
-  Register  src_0 = is64bit ? in.AsRegisterPairLow<Register>() : in.AsRegister<Register>();
-  Register  src_1 = is64bit ? in.AsRegisterPairHigh<Register>() : src_0;
-  SRegister tmp_s = locations->GetTemp(0).AsFpuRegisterPairLow<SRegister>();
-  DRegister tmp_d = FromLowSToD(tmp_s);
-  Register  out_r = locations->Out().AsRegister<Register>();
-
-  // Move data from core register(s) to temp D-reg for bit count calculation, then move back.
-  // According to Cortex A57 and A72 optimization guides, compared to transferring to full D-reg,
-  // transferring data from core reg to upper or lower half of vfp D-reg requires extra latency,
-  // That's why for integer bit count, we use 'vmov d0, r0, r0' instead of 'vmov d0[0], r0'.
-  __ vmovdrr(tmp_d, src_1, src_0);                         // Temp DReg |--src_1|--src_0|
-  __ vcntd(tmp_d, tmp_d);                                  // Temp DReg |c|c|c|c|c|c|c|c|
-  __ vpaddld(tmp_d, tmp_d, 8, /* is_unsigned */ true);     // Temp DReg |--c|--c|--c|--c|
-  __ vpaddld(tmp_d, tmp_d, 16, /* is_unsigned */ true);    // Temp DReg |------c|------c|
-  if (is64bit) {
-    __ vpaddld(tmp_d, tmp_d, 32, /* is_unsigned */ true);  // Temp DReg |--------------c|
-  }
-  __ vmovrs(out_r, tmp_s);
-}
-
-void IntrinsicLocationsBuilderARM::VisitIntegerBitCount(HInvoke* invoke) {
-  CreateIntToIntLocations(arena_, invoke);
-  invoke->GetLocations()->AddTemp(Location::RequiresFpuRegister());
-}
-
-void IntrinsicCodeGeneratorARM::VisitIntegerBitCount(HInvoke* invoke) {
-  GenBitCount(invoke, /* is64bit */ false, GetAssembler());
-}
-
-void IntrinsicLocationsBuilderARM::VisitLongBitCount(HInvoke* invoke) {
-  VisitIntegerBitCount(invoke);
-}
-
-void IntrinsicCodeGeneratorARM::VisitLongBitCount(HInvoke* invoke) {
-  GenBitCount(invoke, /* is64bit */ true, GetAssembler());
-}
-
 void IntrinsicLocationsBuilderARM::VisitStringGetCharsNoCheck(HInvoke* invoke) {
   LocationSummary* locations = new (arena_) LocationSummary(invoke,
                                                             LocationSummary::kNoCall,
@@ -2160,6 +2116,8 @@ void IntrinsicCodeGeneratorARM::VisitDoubleIsInfinite(HInvoke* invoke) {
   __ Lsr(out, out, 5);
 }
 
+UNIMPLEMENTED_INTRINSIC(ARM, IntegerBitCount)
+UNIMPLEMENTED_INTRINSIC(ARM, LongBitCount)
 UNIMPLEMENTED_INTRINSIC(ARM, MathMinDoubleDouble)
 UNIMPLEMENTED_INTRINSIC(ARM, MathMinFloatFloat)
 UNIMPLEMENTED_INTRINSIC(ARM, MathMaxDoubleDouble)