[Liftoff] Add memory tracing support

This adds support for tracing memory operations in code compiled with
Liftoff. This is the first runtime call we emit from Liftoff code, so
part of this code can be reused for other runtime calls.

Drive-by: Reuse outer compilation zone (avoid one Zone allocation).

Bug: v8:6600, v8:7210
Change-Id: I8b22088d0685338d533d328cb371384210e0ed22
Reviewed-on: https://chromium-review.googlesource.com/864663Reviewed-by: Ben Titzer <titzer@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50652}

src/compiler/wasm-compiler.h

@@ -144,6 +144,9 @@ class WasmCompilationUnit final {
     wasm::LiftoffAssembler asm_;
     int safepoint_table_offset_;
     SourcePositionTableBuilder source_position_table_builder_;
+    // The {codegen_zone_} needs to survive until FinishCompilation. It's only
+    // rarely used (e.g. for runtime calls), so it's only allocated when needed.
+    std::unique_ptr<Zone> codegen_zone_;
     explicit LiftoffData(Isolate* isolate) : asm_(isolate) {}
   };
   struct TurbofanData {

src/wasm/baseline/arm/liftoff-assembler-arm.h

@@ -131,6 +131,10 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
   UNIMPLEMENTED();
 }
 
+void LiftoffAssembler::PushCallerFrameSlot(LiftoffRegister reg) {
+  UNIMPLEMENTED();
+}
+
 void LiftoffAssembler::PushRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
 
 void LiftoffAssembler::PopRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
@@ -154,13 +158,22 @@ void LiftoffAssembler::SetCCallStackParamAddr(uint32_t stack_param_idx,
   UNIMPLEMENTED();
 }
 
-void LiftoffAssembler::EmitCCall(ExternalReference ext_ref,
-                                 uint32_t num_params) {
+void LiftoffAssembler::CallC(ExternalReference ext_ref, uint32_t num_params) {
   UNIMPLEMENTED();
 }
 
 void LiftoffAssembler::CallNativeWasmCode(Address addr) { UNIMPLEMENTED(); }
 
+void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::AllocateStackSlot(Register addr, uint32_t size) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::DeallocateStackSlot(uint32_t size) { UNIMPLEMENTED(); }
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8

src/wasm/baseline/arm64/liftoff-assembler-arm64.h

@@ -131,6 +131,10 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
   UNIMPLEMENTED();
 }
 
+void LiftoffAssembler::PushCallerFrameSlot(LiftoffRegister reg) {
+  UNIMPLEMENTED();
+}
+
 void LiftoffAssembler::PushRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
 
 void LiftoffAssembler::PopRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
@@ -154,13 +158,22 @@ void LiftoffAssembler::SetCCallStackParamAddr(uint32_t stack_param_idx,
   UNIMPLEMENTED();
 }
 
-void LiftoffAssembler::EmitCCall(ExternalReference ext_ref,
-                                 uint32_t num_params) {
+void LiftoffAssembler::CallC(ExternalReference ext_ref, uint32_t num_params) {
   UNIMPLEMENTED();
 }
 
 void LiftoffAssembler::CallNativeWasmCode(Address addr) { UNIMPLEMENTED(); }
 
+void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::AllocateStackSlot(Register addr, uint32_t size) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::DeallocateStackSlot(uint32_t size) { UNIMPLEMENTED(); }
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8

src/wasm/baseline/ia32/liftoff-assembler-ia32.h

@@ -170,11 +170,10 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
 void LiftoffAssembler::LoadCallerFrameSlot(LiftoffRegister dst,
                                            uint32_t caller_slot_idx) {
   Operand src(ebp, kPointerSize * (caller_slot_idx + 1));
-  // TODO(clemensh): Handle different sizes here.
   if (dst.is_gp()) {
     mov(dst.gp(), src);
   } else {
-    movsd(dst.fp(), src);
+    movss(dst.fp(), src);
   }
 }
 
@@ -470,21 +469,7 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
       push(liftoff::GetStackSlot(src_index));
       break;
     case VarState::kRegister:
-      switch (src.type()) {
-        case kWasmI32:
-          push(src.reg().gp());
-          break;
-        case kWasmF32:
-          sub(esp, Immediate(sizeof(float)));
-          movss(Operand(esp, 0), src.reg().fp());
-          break;
-        case kWasmF64:
-          sub(esp, Immediate(sizeof(double)));
-          movsd(Operand(esp, 0), src.reg().fp());
-          break;
-        default:
-          UNREACHABLE();
-      }
+      PushCallerFrameSlot(src.reg());
       break;
     case VarState::kI32Const:
       push(Immediate(src.i32_const()));
@@ -492,6 +477,15 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
   }
 }
 
+void LiftoffAssembler::PushCallerFrameSlot(LiftoffRegister reg) {
+  if (reg.is_gp()) {
+    push(reg.gp());
+  } else {
+    sub(esp, Immediate(kPointerSize));
+    movss(Operand(esp, 0), reg.fp());
+  }
+}
+
 void LiftoffAssembler::PushRegisters(LiftoffRegList regs) {
   LiftoffRegList gp_regs = regs & kGpCacheRegList;
   while (!gp_regs.is_empty()) {
@@ -563,8 +557,7 @@ void LiftoffAssembler::SetCCallStackParamAddr(uint32_t stack_param_idx,
   mov(Operand(esp, param_idx * kPointerSize), kScratch);
 }
 
-void LiftoffAssembler::EmitCCall(ExternalReference ext_ref,
-                                 uint32_t num_params) {
+void LiftoffAssembler::CallC(ExternalReference ext_ref, uint32_t num_params) {
   CallCFunction(ext_ref, static_cast<int>(num_params));
 }
 
@@ -572,6 +565,21 @@ void LiftoffAssembler::CallNativeWasmCode(Address addr) {
   wasm_call(addr, RelocInfo::WASM_CALL);
 }
 
+void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
+  // Set context to zero.
+  xor_(esi, esi);
+  CallRuntimeDelayed(zone, fid);
+}
+
+void LiftoffAssembler::AllocateStackSlot(Register addr, uint32_t size) {
+  sub(esp, Immediate(size));
+  mov(addr, esp);
+}
+
+void LiftoffAssembler::DeallocateStackSlot(uint32_t size) {
+  add(esp, Immediate(size));
+}
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8

src/wasm/baseline/liftoff-assembler.h

@@ -341,6 +341,7 @@ class LiftoffAssembler : public TurboAssembler {
 
   // Push a value to the stack (will become a caller frame slot).
   inline void PushCallerFrameSlot(const VarState& src, uint32_t src_index);
+  inline void PushCallerFrameSlot(LiftoffRegister reg);
   inline void PushRegisters(LiftoffRegList);
   inline void PopRegisters(LiftoffRegList);
 
@@ -354,10 +355,16 @@ class LiftoffAssembler : public TurboAssembler {
                                    uint32_t num_params);
   inline void SetCCallStackParamAddr(uint32_t stack_param_idx,
                                      uint32_t param_idx, uint32_t num_params);
-  inline void EmitCCall(ExternalReference ext_ref, uint32_t num_params);
+  inline void CallC(ExternalReference ext_ref, uint32_t num_params);
 
   inline void CallNativeWasmCode(Address addr);
 
+  inline void CallRuntime(Zone* zone, Runtime::FunctionId fid);
+
+  // Reserve space in the current frame, store address to space in {addr}.
+  inline void AllocateStackSlot(Register addr, uint32_t size);
+  inline void DeallocateStackSlot(uint32_t size);
+
   ////////////////////////////////////
   // End of platform-specific part. //
   ////////////////////////////////////

src/wasm/baseline/liftoff-compiler.cc

@@ -11,6 +11,7 @@
 #include "src/counters.h"
 #include "src/macro-assembler-inl.h"
 #include "src/wasm/function-body-decoder-impl.h"
+#include "src/wasm/memory-tracing.h"
 #include "src/wasm/wasm-objects.h"
 #include "src/wasm/wasm-opcodes.h"
 
@@ -109,7 +110,8 @@ class LiftoffCompiler {
                   compiler::RuntimeExceptionSupport runtime_exception_support,
                   SourcePositionTableBuilder* source_position_table_builder,
                   std::vector<trap_handler::ProtectedInstructionData>*
-                      protected_instructions)
+                      protected_instructions,
+                  Zone* compilation_zone, std::unique_ptr<Zone>* codegen_zone)
       : asm_(liftoff_asm),
         call_desc_(call_desc),
         env_(env),
@@ -121,9 +123,9 @@ class LiftoffCompiler {
         runtime_exception_support_(runtime_exception_support),
         source_position_table_builder_(source_position_table_builder),
         protected_instructions_(protected_instructions),
-        compilation_zone_(liftoff_asm->isolate()->allocator(),
-                          "liftoff compilation"),
-        safepoint_table_builder_(&compilation_zone_) {
+        compilation_zone_(compilation_zone),
+        codegen_zone_(codegen_zone),
+        safepoint_table_builder_(compilation_zone_) {
     // Check for overflow in max_size_.
     DCHECK_EQ(max_size_, uint64_t{env_->module->has_maximum_pages
                                       ? env_->module->maximum_pages
@@ -432,12 +434,12 @@ class LiftoffCompiler {
 
     MachineSignature sig(kNumReturns, num_args, kReps);
     compiler::CallDescriptor* desc =
-        compiler::Linkage::GetSimplifiedCDescriptor(&compilation_zone_, &sig);
+        compiler::Linkage::GetSimplifiedCDescriptor(compilation_zone_, &sig);
 
     // Before making a call, spill all cache registers.
     __ SpillAllRegisters();
 
-    // Store arguments on our stack, then align the stack for calling to c.
+    // Store arguments on our stack, then align the stack for calling to C.
     uint32_t num_params = static_cast<uint32_t>(desc->ParameterCount());
     __ PrepareCCall(num_params, arg_regs);
 
@@ -460,7 +462,7 @@ class LiftoffCompiler {
     }
 
     // Now execute the call.
-    __ EmitCCall(ext_ref, num_params);
+    __ CallC(ext_ref, num_params);
 
     // Load return value.
     compiler::LinkageLocation return_loc = desc->GetReturnLocation(0);
@@ -804,6 +806,69 @@ class LiftoffCompiler {
     __ emit_cond_jump(kUnsignedGreaterEqual, trap_label);
   }
 
+  void TraceMemoryOperation(bool is_store, MachineRepresentation rep,
+                            Register index, uint32_t offset,
+                            WasmCodePosition position) {
+    // Before making the runtime call, spill all cache registers.
+    __ SpillAllRegisters();
+
+    LiftoffRegList pinned = LiftoffRegList::ForRegs(index);
+    // Get one register for computing the address (offset + index).
+    LiftoffRegister address = pinned.set(__ GetUnusedRegister(kGpReg, pinned));
+    // Compute offset+index in address.
+    __ LoadConstant(address, WasmValue(offset));
+    __ emit_i32_add(address.gp(), address.gp(), index);
+
+    // Get a register to hold the stack slot for wasm::MemoryTracingInfo.
+    LiftoffRegister info = pinned.set(__ GetUnusedRegister(kGpReg, pinned));
+    // Allocate stack slot for wasm::MemoryTracingInfo.
+    __ AllocateStackSlot(info.gp(), sizeof(wasm::MemoryTracingInfo));
+
+    // Now store all information into the wasm::MemoryTracingInfo struct.
+    __ Store(info.gp(), no_reg, offsetof(wasm::MemoryTracingInfo, address),
+             address, StoreType::kI32Store, pinned);
+    __ LoadConstant(address, WasmValue(is_store ? 1 : 0));
+    __ Store(info.gp(), no_reg, offsetof(wasm::MemoryTracingInfo, is_store),
+             address, StoreType::kI32Store8, pinned);
+    __ LoadConstant(address, WasmValue(static_cast<int>(rep)));
+    __ Store(info.gp(), no_reg, offsetof(wasm::MemoryTracingInfo, mem_rep),
+             address, StoreType::kI32Store8, pinned);
+
+    source_position_table_builder_->AddPosition(
+        __ pc_offset(), SourcePosition(position), false);
+
+    Register args[] = {info.gp()};
+    GenerateRuntimeCall(arraysize(args), args);
+  }
+
+  void GenerateRuntimeCall(int num_args, Register* args) {
+    compiler::CallDescriptor* desc =
+        compiler::Linkage::GetRuntimeCallDescriptor(
+            compilation_zone_, Runtime::kWasmTraceMemory, num_args,
+            compiler::Operator::kNoProperties,
+            compiler::CallDescriptor::kNoFlags);
+    // Currently, only one argument is supported. More arguments require some
+    // caution for the parallel register moves (reuse StackTransferRecipe).
+    DCHECK_EQ(1, num_args);
+    constexpr size_t kInputShift = 1;  // Input 0 is the call target.
+    compiler::LinkageLocation param_loc = desc->GetInputLocation(kInputShift);
+    if (param_loc.IsRegister()) {
+      Register reg = Register::from_code(param_loc.AsRegister());
+      __ Move(LiftoffRegister(reg), LiftoffRegister(args[0]));
+    } else {
+      DCHECK(param_loc.IsCallerFrameSlot());
+      __ PushCallerFrameSlot(LiftoffRegister(args[0]));
+    }
+
+    // Allocate the codegen zone if not done before.
+    if (!*codegen_zone_) {
+      codegen_zone_->reset(
+          new Zone(__ isolate()->allocator(), "LiftoffCodegenZone"));
+    }
+    __ CallRuntime(codegen_zone_->get(), Runtime::kWasmTraceMemory);
+    __ DeallocateStackSlot(sizeof(wasm::MemoryTracingInfo));
+  }
+
   void LoadMem(Decoder* decoder, LoadType type,
                const MemoryAccessOperand<validate>& operand,
                const Value& index_val, Value* result) {
@@ -829,6 +894,11 @@ class LiftoffCompiler {
     }
     __ PushRegister(value_type, value);
     CheckStackSizeLimit(decoder);
+
+    if (FLAG_wasm_trace_memory) {
+      TraceMemoryOperation(false, type.mem_type().representation(), index,
+                           operand.offset, decoder->position());
+    }
   }
 
   void StoreMem(Decoder* decoder, StoreType type,
@@ -854,6 +924,10 @@ class LiftoffCompiler {
     if (env_->use_trap_handler) {
       AddOutOfLineTrap(decoder->position(), protected_store_pc);
     }
+    if (FLAG_wasm_trace_memory) {
+      TraceMemoryOperation(true, type.mem_rep(), index, operand.offset,
+                           decoder->position());
+    }
   }
 
   void CurrentMemoryPages(Decoder* decoder, Value* result) {
@@ -870,7 +944,7 @@ class LiftoffCompiler {
       return unsupported(decoder, "multi-return");
 
     compiler::CallDescriptor* call_desc =
-        compiler::GetWasmCallDescriptor(&compilation_zone_, operand.sig);
+        compiler::GetWasmCallDescriptor(compilation_zone_, operand.sig);
 
     __ PrepareCall(operand.sig, call_desc);
 
@@ -948,7 +1022,10 @@ class LiftoffCompiler {
   // Zone used to store information during compilation. The result will be
   // stored independently, such that this zone can die together with the
   // LiftoffCompiler after compilation.
-  Zone compilation_zone_;
+  Zone* compilation_zone_;
+  // This zone is allocated when needed, held externally, and survives until
+  // code generation (in FinishCompilation).
+  std::unique_ptr<Zone>* codegen_zone_;
   SafepointTableBuilder safepoint_table_builder_;
 
   void TraceCacheState(Decoder* decoder) const {
@@ -991,7 +1068,7 @@ bool compiler::WasmCompilationUnit::ExecuteLiftoffCompilation() {
       decoder(&zone, module, func_body_, &liftoff_.asm_, call_desc, env_,
               runtime_exception_support_,
               &liftoff_.source_position_table_builder_,
-              protected_instructions_.get());
+              protected_instructions_.get(), &zone, &liftoff_.codegen_zone_);
   decoder.Decode();
   liftoff_compile_time_scope.reset();
   if (!decoder.interface().ok()) {

src/wasm/baseline/mips/liftoff-assembler-mips.h

@@ -131,6 +131,10 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
   UNIMPLEMENTED();
 }
 
+void LiftoffAssembler::PushCallerFrameSlot(LiftoffRegister reg) {
+  UNIMPLEMENTED();
+}
+
 void LiftoffAssembler::PushRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
 
 void LiftoffAssembler::PopRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
@@ -154,13 +158,22 @@ void LiftoffAssembler::SetCCallStackParamAddr(uint32_t stack_param_idx,
   UNIMPLEMENTED();
 }
 
-void LiftoffAssembler::EmitCCall(ExternalReference ext_ref,
-                                 uint32_t num_params) {
+void LiftoffAssembler::CallC(ExternalReference ext_ref, uint32_t num_params) {
   UNIMPLEMENTED();
 }
 
 void LiftoffAssembler::CallNativeWasmCode(Address addr) { UNIMPLEMENTED(); }
 
+void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::AllocateStackSlot(Register addr, uint32_t size) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::DeallocateStackSlot(uint32_t size) { UNIMPLEMENTED(); }
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8

src/wasm/baseline/mips64/liftoff-assembler-mips64.h

@@ -131,6 +131,10 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
   UNIMPLEMENTED();
 }
 
+void LiftoffAssembler::PushCallerFrameSlot(LiftoffRegister reg) {
+  UNIMPLEMENTED();
+}
+
 void LiftoffAssembler::PushRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
 
 void LiftoffAssembler::PopRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
@@ -154,13 +158,22 @@ void LiftoffAssembler::SetCCallStackParamAddr(uint32_t stack_param_idx,
   UNIMPLEMENTED();
 }
 
-void LiftoffAssembler::EmitCCall(ExternalReference ext_ref,
-                                 uint32_t num_params) {
+void LiftoffAssembler::CallC(ExternalReference ext_ref, uint32_t num_params) {
   UNIMPLEMENTED();
 }
 
 void LiftoffAssembler::CallNativeWasmCode(Address addr) { UNIMPLEMENTED(); }
 
+void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::AllocateStackSlot(Register addr, uint32_t size) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::DeallocateStackSlot(uint32_t size) { UNIMPLEMENTED(); }
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8

src/wasm/baseline/ppc/liftoff-assembler-ppc.h

@@ -131,6 +131,10 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
   UNIMPLEMENTED();
 }
 
+void LiftoffAssembler::PushCallerFrameSlot(LiftoffRegister reg) {
+  UNIMPLEMENTED();
+}
+
 void LiftoffAssembler::PushRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
 
 void LiftoffAssembler::PopRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
@@ -154,13 +158,22 @@ void LiftoffAssembler::SetCCallStackParamAddr(uint32_t stack_param_idx,
   UNIMPLEMENTED();
 }
 
-void LiftoffAssembler::EmitCCall(ExternalReference ext_ref,
-                                 uint32_t num_params) {
+void LiftoffAssembler::CallC(ExternalReference ext_ref, uint32_t num_params) {
   UNIMPLEMENTED();
 }
 
 void LiftoffAssembler::CallNativeWasmCode(Address addr) { UNIMPLEMENTED(); }
 
+void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::AllocateStackSlot(Register addr, uint32_t size) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::DeallocateStackSlot(uint32_t size) { UNIMPLEMENTED(); }
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8

src/wasm/baseline/s390/liftoff-assembler-s390.h

@@ -131,6 +131,10 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
   UNIMPLEMENTED();
 }
 
+void LiftoffAssembler::PushCallerFrameSlot(LiftoffRegister reg) {
+  UNIMPLEMENTED();
+}
+
 void LiftoffAssembler::PushRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
 
 void LiftoffAssembler::PopRegisters(LiftoffRegList regs) { UNIMPLEMENTED(); }
@@ -154,13 +158,22 @@ void LiftoffAssembler::SetCCallStackParamAddr(uint32_t stack_param_idx,
   UNIMPLEMENTED();
 }
 
-void LiftoffAssembler::EmitCCall(ExternalReference ext_ref,
-                                 uint32_t num_params) {
+void LiftoffAssembler::CallC(ExternalReference ext_ref, uint32_t num_params) {
   UNIMPLEMENTED();
 }
 
 void LiftoffAssembler::CallNativeWasmCode(Address addr) { UNIMPLEMENTED(); }
 
+void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::AllocateStackSlot(Register addr, uint32_t size) {
+  UNIMPLEMENTED();
+}
+
+void LiftoffAssembler::DeallocateStackSlot(uint32_t size) { UNIMPLEMENTED(); }
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8

src/wasm/baseline/x64/liftoff-assembler-x64.h

@@ -455,12 +455,7 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
       pushq(liftoff::GetStackSlot(src_index));
       break;
     case VarState::kRegister:
-      if (src.reg().is_gp()) {
-        pushq(src.reg().gp());
-      } else {
-        subp(rsp, Immediate(kStackSlotSize));
-        Movsd(Operand(rsp, 0), src.reg().fp());
-      }
+      PushCallerFrameSlot(src.reg());
       break;
     case VarState::kI32Const:
       pushq(Immediate(src.i32_const()));
@@ -468,6 +463,15 @@ void LiftoffAssembler::PushCallerFrameSlot(const VarState& src,
   }
 }
 
+void LiftoffAssembler::PushCallerFrameSlot(LiftoffRegister reg) {
+  if (reg.is_gp()) {
+    pushq(reg.gp());
+  } else {
+    subp(rsp, Immediate(kPointerSize));
+    Movsd(Operand(rsp, 0), reg.fp());
+  }
+}
+
 void LiftoffAssembler::PushRegisters(LiftoffRegList regs) {
   LiftoffRegList gp_regs = regs & kGpCacheRegList;
   while (!gp_regs.is_empty()) {
@@ -534,8 +538,7 @@ void LiftoffAssembler::SetCCallStackParamAddr(uint32_t stack_param_idx,
   UNREACHABLE();
 }
 
-void LiftoffAssembler::EmitCCall(ExternalReference ext_ref,
-                                 uint32_t num_params) {
+void LiftoffAssembler::CallC(ExternalReference ext_ref, uint32_t num_params) {
   CallCFunction(ext_ref, static_cast<int>(num_params));
 }
 
@@ -543,6 +546,21 @@ void LiftoffAssembler::CallNativeWasmCode(Address addr) {
   near_call(addr, RelocInfo::WASM_CALL);
 }
 
+void LiftoffAssembler::CallRuntime(Zone* zone, Runtime::FunctionId fid) {
+  // Set context to zero.
+  xorp(rsi, rsi);
+  CallRuntimeDelayed(zone, fid);
+}
+
+void LiftoffAssembler::AllocateStackSlot(Register addr, uint32_t size) {
+  subp(rsp, Immediate(size));
+  movp(addr, rsp);
+}
+
+void LiftoffAssembler::DeallocateStackSlot(uint32_t size) {
+  addp(rsp, Immediate(size));
+}
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8

test/message/message.status

@@ -36,9 +36,4 @@
   # tested standalone.
   'fail/modules-skip*': [SKIP],
 }],  # ALWAYS
-
-['variant == liftoff', {
-  # Memory tracing is not yet implemented in liftoff (crbug.com/v8/7210).
-  'wasm-trace-memory': [SKIP],
-}], # variant == liftoff
 ]