[vm, compiler] More specific assembly comments for runtime calls.

TEST=ci Change-Id: Iaabdbceedbddffd2f980fb0828a8fc211524a3d5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/455180 Commit-Queue: Ryan Macnak <rmacnak@google.com> Reviewed-by: Alexander Markov <alexmarkov@google.com>

Author: rmacnak-google

runtime/vm/compiler/assembler/assembler_arm.cc

@@ -3281,6 +3281,7 @@ void Assembler::CallRuntime(const RuntimeEntry& entry,
  LoadFromOffset(R9, THR, entry.OffsetFromThread());
  LoadImmediate(R4, argument_count);
  ldr(IP, Address(THR, target::Thread::call_to_runtime_entry_point_offset()));
+ Comment("Runtime call: %s", entry.name());
  blx(IP);
 }
 
@@ -3298,7 +3299,6 @@ LeafRuntimeScope::LeafRuntimeScope(Assembler* assembler,
  intptr_t frame_size,
  bool preserve_registers)
  : assembler_(assembler), preserve_registers_(preserve_registers) {
- __ Comment("EnterCallRuntimeFrame");
  if (preserve_registers) {
  // Preserve volatile CPU registers and PP.
  SPILLS_LR_TO_FRAME(__ EnterFrame(
@@ -3323,6 +3323,7 @@ void LeafRuntimeScope::Call(const RuntimeEntry& entry,
  __ LoadFromOffset(TMP, THR, entry.OffsetFromThread());
  __ str(TMP,
  compiler::Address(THR, compiler::target::Thread::vm_tag_offset()));
+ __ Comment("Leaf runtime call: %s", entry.name());
  __ blx(TMP);
  __ LoadImmediate(TMP, VMTag::kDartTagId);
  __ str(TMP,

runtime/vm/compiler/assembler/assembler_arm64.cc

@@ -1807,6 +1807,7 @@ void Assembler::CallRuntime(const RuntimeEntry& entry,
  }
  ldr(R5, compiler::Address(THR, entry.OffsetFromThread()));
  LoadImmediate(R4, argument_count);
+ Comment("Runtime call: %s", entry.name());
  Call(Address(THR, target::Thread::call_to_runtime_entry_point_offset()));
  if (FLAG_target_thread_sanitizer && FLAG_precompiled_mode &&
  tsan_enter_exit) {
@@ -1824,7 +1825,6 @@ LeafRuntimeScope::LeafRuntimeScope(Assembler* assembler,
  intptr_t frame_size,
  bool preserve_registers)
  : assembler_(assembler), preserve_registers_(preserve_registers) {
- __ Comment("EnterCallRuntimeFrame");
  __ EnterFrame(0);
 
  if (preserve_registers) {
@@ -1854,6 +1854,7 @@ void LeafRuntimeScope::Call(const RuntimeEntry& entry,
  __ mov(CSP, SP);
  __ ldr(TMP, compiler::Address(THR, entry.OffsetFromThread()));
  __ str(TMP, compiler::Address(THR, target::Thread::vm_tag_offset()));
+ __ Comment("Leaf runtime call: %s", entry.name());
  __ blr(TMP);
  __ LoadImmediate(TMP, VMTag::kDartTagId);
  __ str(TMP, compiler::Address(THR, target::Thread::vm_tag_offset()));

runtime/vm/compiler/assembler/assembler_ia32.cc

@@ -2622,6 +2622,7 @@ void Assembler::CallRuntime(const RuntimeEntry& entry,
  // informative error message.
  movl(ECX, compiler::Address(THR, entry.OffsetFromThread()));
  movl(EDX, compiler::Immediate(argument_count));
+ Comment("Runtime call: %s", entry.name());
  call(Address(THR, target::Thread::call_to_runtime_entry_point_offset()));
 }
 
@@ -2631,7 +2632,6 @@ LeafRuntimeScope::LeafRuntimeScope(Assembler* assembler,
  intptr_t frame_size,
  bool preserve_registers)
  : assembler_(assembler), preserve_registers_(preserve_registers) {
- __ Comment("EnterCallRuntimeFrame");
  __ EnterFrame(0);
 
  if (preserve_registers_) {
@@ -2663,6 +2663,7 @@ void LeafRuntimeScope::Call(const RuntimeEntry& entry,
  ASSERT(argument_count == entry.argument_count());
  __ movl(EAX, compiler::Address(THR, entry.OffsetFromThread()));
  __ movl(compiler::Assembler::VMTagAddress(), EAX);
+ __ Comment("Leaf runtime call: %s", entry.name());
  __ call(EAX);
  __ movl(compiler::Assembler::VMTagAddress(),
  compiler::Immediate(VMTag::kDartTagId));

runtime/vm/compiler/assembler/assembler_riscv.cc

@@ -4831,6 +4831,7 @@ void Assembler::CallRuntime(const RuntimeEntry& entry,
  }
  lx(T5, compiler::Address(THR, entry.OffsetFromThread()));
  li(T4, argument_count);
+ Comment("Runtime call: %s", entry.name());
  Call(Address(THR, target::Thread::call_to_runtime_entry_point_offset()));
  if (FLAG_target_thread_sanitizer && FLAG_precompiled_mode &&
  tsan_enter_exit) {
@@ -4877,6 +4878,7 @@ void LeafRuntimeScope::Call(const RuntimeEntry& entry,
  ASSERT(argument_count == entry.argument_count());
  __ Load(TMP2, compiler::Address(THR, entry.OffsetFromThread()));
  __ sx(TMP2, compiler::Address(THR, target::Thread::vm_tag_offset()));
+ __ Comment("Leaf runtime call: %s", entry.name());
  __ jalr(TMP2);
  __ LoadImmediate(TMP2, VMTag::kDartTagId);
  __ sx(TMP2, compiler::Address(THR, target::Thread::vm_tag_offset()));

runtime/vm/compiler/assembler/assembler_x64.cc

@@ -2069,6 +2069,7 @@ void Assembler::CallRuntime(const RuntimeEntry& entry,
  }
  movq(RBX, compiler::Address(THR, entry.OffsetFromThread()));
  LoadImmediate(R10, compiler::Immediate(argument_count));
+ Comment("Runtime call: %s", entry.name());
  call(Address(THR, target::Thread::call_to_runtime_entry_point_offset()));
  if (FLAG_target_thread_sanitizer && FLAG_precompiled_mode &&
  tsan_enter_exit) {
@@ -2085,7 +2086,6 @@ LeafRuntimeScope::LeafRuntimeScope(Assembler* assembler,
  intptr_t frame_size,
  bool preserve_registers)
  : assembler_(assembler), preserve_registers_(preserve_registers) {
- __ Comment("EnterCallRuntimeFrame");
  __ EnterFrame(0);
 
  if (preserve_registers_) {
@@ -2107,6 +2107,7 @@ void LeafRuntimeScope::Call(const RuntimeEntry& entry,
  COMPILE_ASSERT(CallingConventions::kVolatileCpuRegisters & (1 << RAX));
  __ movq(RAX, compiler::Address(THR, entry.OffsetFromThread()));
  __ movq(compiler::Assembler::VMTagAddress(), RAX);
+ __ Comment("Leaf runtime call: %s", entry.name());
  __ CallCFunction(RAX);
  __ movq(compiler::Assembler::VMTagAddress(),
  compiler::Immediate(VMTag::kDartTagId));

runtime/vm/compiler/runtime_api.cc

@@ -333,6 +333,10 @@ word RuntimeEntry::OffsetFromThread() const {
  return target::Thread::OffsetFromThread(runtime_entry_);
 }
 
+const char* RuntimeEntry::name() const {
+ return runtime_entry_->name();
+}
+
 bool RuntimeEntry::is_leaf() const {
  return runtime_entry_->is_leaf();
 }

runtime/vm/compiler/runtime_api.h

@@ -227,6 +227,7 @@ class RuntimeEntry : public ValueObject {
 
  word OffsetFromThread() const;
 
+ const char* name() const;
  bool is_leaf() const;
  intptr_t argument_count() const;