Reland "Change hotness counting."
This reverts commit ce131feb7c60ffdf28c315c5d67f9cac33a077ce.
Bug: 203810169
Test: test.py
Test: health/microbench/startup/hscapps/compile-speed-profile/open-clock
Reason for revert: Kept logic from before on what methods to save in the
profile.
Change-Id: Id67cd47a9fe31b4c6b154db20f632015238016d2
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index d455614..a323405 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -1189,10 +1189,12 @@
__ Ldr(method, MemOperand(sp, 0));
}
__ Ldrh(counter, MemOperand(method, ArtMethod::HotnessCountOffset().Int32Value()));
- __ Add(counter, counter, 1);
- // Subtract one if the counter would overflow.
- __ Sub(counter, counter, Operand(counter, LSR, 16));
+ vixl::aarch64::Label done;
+ DCHECK_EQ(0u, interpreter::kNterpHotnessValue);
+ __ Cbz(counter, &done);
+ __ Add(counter, counter, -1);
__ Strh(counter, MemOperand(method, ArtMethod::HotnessCountOffset().Int32Value()));
+ __ Bind(&done);
}
if (GetGraph()->IsCompilingBaseline() && !Runtime::Current()->IsAotCompiler()) {
diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc
index bf0c77d..6d77f54 100644
--- a/compiler/optimizing/code_generator_arm_vixl.cc
+++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@ -2186,10 +2186,12 @@
}
// Load with zero extend to clear the high bits for integer overflow check.
__ Ldrh(temp, MemOperand(kMethodRegister, ArtMethod::HotnessCountOffset().Int32Value()));
- __ Add(temp, temp, 1);
- // Subtract one if the counter would overflow.
- __ Sub(temp, temp, Operand(temp, ShiftType::LSR, 16));
+ vixl::aarch32::Label done;
+ DCHECK_EQ(0u, interpreter::kNterpHotnessValue);
+ __ CompareAndBranchIfZero(temp, &done, /* is_far_target= */ false);
+ __ Add(temp, temp, -1);
__ Strh(temp, MemOperand(kMethodRegister, ArtMethod::HotnessCountOffset().Int32Value()));
+ __ Bind(&done);
if (!is_frame_entry) {
__ Pop(vixl32::Register(kMethodRegister));
GetAssembler()->cfi().AdjustCFAOffset(-static_cast<int>(kArmWordSize));
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index a04b412..4008b7d 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -1197,10 +1197,9 @@
}
NearLabel overflow;
__ cmpw(Address(reg, ArtMethod::HotnessCountOffset().Int32Value()),
- Immediate(ArtMethod::MaxCounter()));
+ Immediate(interpreter::kNterpHotnessValue));
__ j(kEqual, &overflow);
- __ addw(Address(reg, ArtMethod::HotnessCountOffset().Int32Value()),
- Immediate(1));
+ __ addw(Address(reg, ArtMethod::HotnessCountOffset().Int32Value()), Immediate(-1));
__ Bind(&overflow);
if (!is_frame_entry) {
__ popl(EAX);
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index 4ec2dd7..ad81620 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -1591,10 +1591,10 @@
__ movq(CpuRegister(method), Address(CpuRegister(RSP), kCurrentMethodStackOffset));
}
__ cmpw(Address(CpuRegister(method), ArtMethod::HotnessCountOffset().Int32Value()),
- Immediate(ArtMethod::MaxCounter()));
+ Immediate(interpreter::kNterpHotnessValue));
__ j(kEqual, &overflow);
__ addw(Address(CpuRegister(method), ArtMethod::HotnessCountOffset().Int32Value()),
- Immediate(1));
+ Immediate(-1));
__ Bind(&overflow);
}