commit f76ca8c3cb8a1f0ceee099ef8ce64295286b8b6b
author Vladimir Marko <vmarko@google.com> Wed Apr 05 15:24:41 2023 +0000
committer Vladimir Marko <vmarko@google.com> Thu Apr 06 10:06:57 2023 +0000
tree 11aa40ca2e1f5af365c84caf8493001014451c93
parent d2be01cdd96522828adcea8d245f48915dc7e507

Clean up creating constant locations.

Change `Location::ConstantLocation()` to allow passing any
instruction and `DCHECK()` that it is indeed a constant.
Skip explicit calls to `HInstruction::AsConstant()` before
calling `Location::ConstantLocation()`.

Also cache results of `instuction->InputAt(.)` in some cases
when it's used more than once.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: run-gtests.sh
Test: testrunner.py --target --optimizing
Change-Id: I3c07642f6b3523b576ec229e4d234561ad74a20e

compiler/optimizing/intrinsics.cc

diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc
index aa5e4f3..774deec 100644
--- a/compiler/optimizing/intrinsics.cc
+++ b/compiler/optimizing/intrinsics.cc
@@ -171,6 +171,7 @@
   if (!CanReferenceBootImageObjects(invoke, compiler_options)) {
     return;
   }
+  HInstruction* const input = invoke->InputAt(0);
   if (compiler_options.IsBootImage()) {
     if (!compiler_options.IsImageClass(kIntegerCacheDescriptor) ||
         !compiler_options.IsImageClass(kIntegerDescriptor)) {
@@ -207,8 +208,8 @@
         CHECK_EQ(value_field->GetInt(current_object), low + i);
       }
     }
-    if (invoke->InputAt(0)->IsIntConstant()) {
-      int32_t value = invoke->InputAt(0)->AsIntConstant()->GetValue();
+    if (input->IsIntConstant()) {
+      int32_t value = input->AsIntConstant()->GetValue();
       if (static_cast<uint32_t>(value) - static_cast<uint32_t>(low) <
           static_cast<uint32_t>(high - low + 1)) {
         // No call, we shall use direct pointer to the Integer object.
@@ -232,8 +233,8 @@
     } else {
       DCHECK(compiler_options.IsAotCompiler());
       DCHECK(CheckIntegerCache(self, runtime->GetClassLinker(), boot_image_live_objects, cache));
-      if (invoke->InputAt(0)->IsIntConstant()) {
-        int32_t value = invoke->InputAt(0)->AsIntConstant()->GetValue();
+      if (input->IsIntConstant()) {
+        int32_t value = input->AsIntConstant()->GetValue();
         // Retrieve the `value` from the lowest cached Integer.
         ObjPtr<mirror::Object> low_integer =
             IntrinsicObjects::GetIntegerValueOfObject(boot_image_live_objects, 0u);
@@ -255,11 +256,11 @@
   ArenaAllocator* allocator = codegen->GetGraph()->GetAllocator();
   LocationSummary* locations = new (allocator) LocationSummary(invoke, call_kind, kIntrinsified);
   if (call_kind == LocationSummary::kCallOnMainOnly) {
-    locations->SetInAt(0, Location::RegisterOrConstant(invoke->InputAt(0)));
+    locations->SetInAt(0, Location::RegisterOrConstant(input));
     locations->AddTemp(first_argument_location);
     locations->SetOut(return_location);
   } else {
-    locations->SetInAt(0, Location::ConstantLocation(invoke->InputAt(0)->AsConstant()));
+    locations->SetInAt(0, Location::ConstantLocation(input));
     locations->SetOut(Location::RequiresRegister());
   }
 }