Skip to content

V
V8
Commit deca6529 authored by Clemens Backes's avatar Clemens Backes Committed by Commit Bot
Browse files
Options

Make FixedSizeSignature<T, 0, 0> constexpr 

This allows to hold a constexpr (empty) "builder" object instead of
creating it for every use.

R=ahaas@chromium.org

Bug: v8:11384
Change-Id: Ib5e13c58e81a950bb5dd0e8eefe4021bc77d8b64
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2773801
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Reviewed-by: 's avatarAndreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#73548}
parent 282c2c30
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 37 deletions
src/codegen/signature.h
View file @ deca6529
......@@ -127,11 +127,6 @@ size_t hash_value(const Signature<T>& sig) {
template <typename T, size_t kNumReturns = 0, size_t kNumParams = 0>
class FixedSizeSignature : public Signature<T> {
public:
explicit FixedSizeSignature(std::array<T, kNumReturns + kNumParams> reps)
: Signature<T>(kNumReturns, kNumParams, reps_) {
std::copy(reps.begin(), reps.end(), reps_);
}
// Add return types to this signature (only allowed if there are none yet).
template <typename... ReturnTypes>
auto Returns(ReturnTypes... return_types) const {
......@@ -162,6 +157,27 @@ class FixedSizeSignature : public Signature<T> {
T reps_[kNumReturns + kNumParams];
};
// Specialization for zero-sized signatures.
template <typename T>
class FixedSizeSignature<T, 0, 0> : public Signature<T> {
public:
constexpr FixedSizeSignature() : Signature<T>(0, 0, nullptr) {}
// Add return types.
template <typename... ReturnTypes>
static auto Returns(ReturnTypes... return_types) {
return FixedSizeSignature<T, sizeof...(ReturnTypes), 0>{
std::initializer_list<T>{return_types...}.begin(), nullptr};
}
// Add parameters.
template <typename... ParamTypes>
static auto Params(ParamTypes... param_types) {
return FixedSizeSignature<T, 0, sizeof...(ParamTypes)>{
nullptr, std::initializer_list<T>{param_types...}.begin()};
}
};
} // namespace internal
} // namespace v8
......
src/wasm/baseline/liftoff-compiler.cc
View file @ deca6529
......@@ -90,10 +90,8 @@ constexpr ValueKind kPointerKind = LiftoffAssembler::kPointerKind;
constexpr ValueKind kSmiKind = LiftoffAssembler::kSmiKind;
constexpr ValueKind kTaggedKind = LiftoffAssembler::kTaggedKind;
// Used to construct fixed-size signatures: MakeSig().Returns(...).Params(...);
FixedSizeSignature<ValueKind> MakeSig() {
return FixedSizeSignature<ValueKind>{{}};
}
// Used to construct fixed-size signatures: MakeSig::Returns(...).Params(...);
using MakeSig = FixedSizeSignature<ValueKind>;
#if V8_TARGET_ARCH_ARM64
// On ARM64, the Assembler keeps track of pointers to Labels to resolve
......@@ -1078,8 +1076,7 @@ class LiftoffCompiler {
pinned.set(__ GetUnusedRegister(kGpReg, pinned));
LOAD_TAGGED_PTR_INSTANCE_FIELD(context_reg.gp(), NativeContext, pinned);
auto sig = MakeSig()
.Returns(kPointerKind)
auto sig = MakeSig::Returns(kPointerKind)
.Params(kPointerKind, kPointerKind, kPointerKind);
LiftoffAssembler::VarState tag_symbol(kPointerKind, tag_symbol_reg, 0);
LiftoffAssembler::VarState context(kPointerKind, context_reg, 0);
......@@ -1156,7 +1153,7 @@ class LiftoffCompiler {
compiler::CallDescriptor* rethrow_descriptor =
GetBuiltinCallDescriptor<WasmRethrowDescriptor>(compilation_zone_);
auto rethrow_sig = MakeSig().Params(kPointerKind);
auto rethrow_sig = MakeSig::Params(kPointerKind);
__ PrepareBuiltinCall(&rethrow_sig, rethrow_descriptor, {exception});
source_position_table_builder_.AddPosition(
__ pc_offset(), SourcePosition(decoder->position()), true);
......@@ -1419,7 +1416,7 @@ class LiftoffCompiler {
auto emit_with_c_fallback = [=](LiftoffRegister dst, LiftoffRegister src) {
if ((asm_.*emit_fn)(dst.fp(), src.fp())) return;
ExternalReference ext_ref = fallback_fn();
auto sig = MakeSig().Params(kind);
auto sig = MakeSig::Params(kind);
GenerateCCall(&dst, &sig, kind, &src, ext_ref);
};
EmitUnOp<kind, kind>(emit_with_c_fallback);
......@@ -1445,7 +1442,7 @@ class LiftoffCompiler {
ExternalReference ext_ref = fallback_fn();
if (can_trap) {
// External references for potentially trapping conversions return int.
auto sig = MakeSig().Returns(kI32).Params(src_kind);
auto sig = MakeSig::Returns(kI32).Params(src_kind);
LiftoffRegister ret_reg =
__ GetUnusedRegister(kGpReg, LiftoffRegList::ForRegs(dst));
LiftoffRegister dst_regs[] = {ret_reg, dst};
......@@ -1566,7 +1563,7 @@ class LiftoffCompiler {
return EmitUnOp<kI32, kI32>(
[=](LiftoffRegister dst, LiftoffRegister src) {
if (__ emit_i32_popcnt(dst.gp(), src.gp())) return;
auto sig = MakeSig().Returns(kI32).Params(kI32);
auto sig = MakeSig::Returns(kI32).Params(kI32);
GenerateCCall(&dst, &sig, kStmt, &src,
ExternalReference::wasm_word32_popcnt());
});
......@@ -1575,7 +1572,7 @@ class LiftoffCompiler {
[=](LiftoffRegister dst, LiftoffRegister src) {
if (__ emit_i64_popcnt(dst, src)) return;
// The c function returns i32. We will zero-extend later.
auto sig = MakeSig().Returns(kI32).Params(kI64);
auto sig = MakeSig::Returns(kI32).Params(kI64);
LiftoffRegister c_call_dst = kNeedI64RegPair ? dst.low() : dst;
GenerateCCall(&c_call_dst, &sig, kStmt, &src,
ExternalReference::wasm_word64_popcnt());
......@@ -1665,7 +1662,7 @@ class LiftoffCompiler {
__ GetUnusedRegister(kGpReg, LiftoffRegList::ForRegs(dst, ret));
LiftoffRegister arg_regs[] = {lhs, rhs};
LiftoffRegister result_regs[] = {ret, dst};
auto sig = MakeSig().Returns(kI32).Params(kI64, kI64);
auto sig = MakeSig::Returns(kI32).Params(kI64, kI64);
GenerateCCall(result_regs, &sig, kI64, arg_regs, ext_ref);
__ LoadConstant(tmp, WasmValue(int32_t{0}));
__ emit_cond_jump(kEqual, trap_by_zero, kI32, ret.gp(), tmp.gp());
......@@ -2017,7 +2014,7 @@ class LiftoffCompiler {
WasmCode::RuntimeStubId target = WasmCode::kWasmRefFunc;
compiler::CallDescriptor* call_descriptor =
GetBuiltinCallDescriptor<WasmRefFuncDescriptor>(compilation_zone_);
auto sig = MakeSig().Returns(kRef).Params(kI32);
auto sig = MakeSig::Returns(kRef).Params(kI32);
LiftoffRegister func_index_reg = __ GetUnusedRegister(kGpReg, {});
__ LoadConstant(func_index_reg, WasmValue(function_index));
LiftoffAssembler::VarState func_index_var(kI32, func_index_reg, 0);
......@@ -3222,7 +3219,7 @@ class LiftoffCompiler {
LiftoffRegister dst = __ GetUnusedRegister(rc, {src}, {});
if (!(asm_.*emit_fn)(dst, src)) {
// Return v128 via stack for ARM.
auto sig_v_s = MakeSig().Params(kS128);
auto sig_v_s = MakeSig::Params(kS128);
GenerateCCall(&dst, &sig_v_s, kS128, &src, ext_ref());
}
__ PushRegister(kS128, dst);
......@@ -4121,7 +4118,7 @@ class LiftoffCompiler {
compilation_zone_);
auto create_values_sig =
MakeSig().Returns(kPointerKind).Params(kPointerKind);
MakeSig::Returns(kPointerKind).Params(kPointerKind);
__ PrepareBuiltinCall(&create_values_sig, create_values_descriptor,
{LiftoffAssembler::VarState{
......@@ -4162,7 +4159,7 @@ class LiftoffCompiler {
compiler::CallDescriptor* throw_descriptor =
GetBuiltinCallDescriptor<WasmThrowDescriptor>(compilation_zone_);
auto throw_sig = MakeSig().Params(kPointerKind, kPointerKind);
auto throw_sig = MakeSig::Params(kPointerKind, kPointerKind);
__ PrepareBuiltinCall(
&throw_sig, throw_descriptor,
......@@ -4437,7 +4434,7 @@ class LiftoffCompiler {
__ emit_ptrsize_addi(index_plus_offset, index_plus_offset, offset);
}
auto sig = MakeSig().Returns(kI32).Params(kPointerKind, kI32);
auto sig = MakeSig::Returns(kI32).Params(kPointerKind, kI32);
auto call_descriptor =
GetBuiltinCallDescriptor<WasmAtomicNotifyDescriptor>(compilation_zone_);
......@@ -4600,7 +4597,7 @@ class LiftoffCompiler {
ExternalReference ext_ref = ExternalReference::wasm_memory_init();
auto sig =
MakeSig().Returns(kI32).Params(kPointerKind, kI32, kI32, kI32, kI32);
MakeSig::Returns(kI32).Params(kPointerKind, kI32, kI32, kI32, kI32);
LiftoffRegister args[] = {LiftoffRegister(instance), dst, src,
segment_index, size};
// We don't need the instance anymore after the call. We can use the
......@@ -4642,7 +4639,7 @@ class LiftoffCompiler {
Register instance = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
__ FillInstanceInto(instance);
ExternalReference ext_ref = ExternalReference::wasm_memory_copy();
auto sig = MakeSig().Returns(kI32).Params(kPointerKind, kI32, kI32, kI32);
auto sig = MakeSig::Returns(kI32).Params(kPointerKind, kI32, kI32, kI32);
LiftoffRegister args[] = {LiftoffRegister(instance), dst, src, size};
// We don't need the instance anymore after the call. We can use the
// register for the result.
......@@ -4663,7 +4660,7 @@ class LiftoffCompiler {
Register instance = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
__ FillInstanceInto(instance);
ExternalReference ext_ref = ExternalReference::wasm_memory_fill();
auto sig = MakeSig().Returns(kI32).Params(kPointerKind, kI32, kI32, kI32);
auto sig = MakeSig::Returns(kI32).Params(kPointerKind, kI32, kI32, kI32);
LiftoffRegister args[] = {LiftoffRegister(instance), dst, value, size};
// We don't need the instance anymore after the call. We can use the
// register for the result.
......@@ -4703,7 +4700,7 @@ class LiftoffCompiler {
compiler::CallDescriptor* call_descriptor =
GetBuiltinCallDescriptor<WasmTableInitDescriptor>(compilation_zone_);
auto sig = MakeSig().Params(kI32, kI32, kI32, kSmiKind, kSmiKind);
auto sig = MakeSig::Params(kI32, kI32, kI32, kSmiKind, kSmiKind);
__ PrepareBuiltinCall(&sig, call_descriptor,
{dst, src, size, table_index, segment_index});
......@@ -4759,7 +4756,7 @@ class LiftoffCompiler {
compiler::CallDescriptor* call_descriptor =
GetBuiltinCallDescriptor<WasmTableCopyDescriptor>(compilation_zone_);
auto sig = MakeSig().Params(kI32, kI32, kI32, kSmiKind, kSmiKind);
auto sig = MakeSig::Params(kI32, kI32, kI32, kSmiKind, kSmiKind);
__ PrepareBuiltinCall(&sig, call_descriptor,
{dst, src, size, table_dst_index, table_src_index});
......@@ -4788,7 +4785,7 @@ class LiftoffCompiler {
compiler::CallDescriptor* call_descriptor =
GetBuiltinCallDescriptor<WasmTableGrowDescriptor>(compilation_zone_);
auto sig = MakeSig().Returns(kSmiKind).Params(kSmiKind, kI32, kTaggedKind);
auto sig = MakeSig::Returns(kSmiKind).Params(kSmiKind, kI32, kTaggedKind);
__ PrepareBuiltinCall(&sig, call_descriptor, {table_index, delta, value});
__ CallRuntimeStub(target);
......@@ -4846,7 +4843,7 @@ class LiftoffCompiler {
compiler::CallDescriptor* call_descriptor =
GetBuiltinCallDescriptor<WasmTableFillDescriptor>(compilation_zone_);
auto sig = MakeSig().Params(kSmiKind, kI32, kI32, kTaggedKind);
auto sig = MakeSig::Params(kSmiKind, kI32, kI32, kTaggedKind);
__ PrepareBuiltinCall(&sig, call_descriptor,
{table_index, start, count, value});
......@@ -4866,7 +4863,7 @@ class LiftoffCompiler {
compiler::CallDescriptor* call_descriptor =
GetBuiltinCallDescriptor<WasmAllocateStructWithRttDescriptor>(
compilation_zone_);
auto sig = MakeSig().Returns(kRef).Params(rtt.type.kind());
auto sig = MakeSig::Returns(kRef).Params(rtt.type.kind());
LiftoffAssembler::VarState rtt_value =
__ cache_state()->stack_state.end()[-1];
__ PrepareBuiltinCall(&sig, call_descriptor, {rtt_value});
......@@ -5876,7 +5873,7 @@ class LiftoffCompiler {
compiler::CallDescriptor* builtin_call_descriptor =
GetBuiltinCallDescriptor<WasmAllocatePairDescriptor>(
compilation_zone_);
auto builtin_sig = MakeSig().Returns(kOptRef).Params(kOptRef, kOptRef);
auto builtin_sig = MakeSig::Returns(kOptRef).Params(kOptRef, kOptRef);
LiftoffRegister current_instance = instance;
__ FillInstanceInto(current_instance.gp());
LiftoffAssembler::VarState instance_var(kOptRef, current_instance, 0);
......
test/unittests/wasm/function-body-decoder-unittest.cc
View file @ deca6529
......@@ -68,10 +68,8 @@ constexpr size_t kMaxByteSizedLeb128 = 127;
using F = std::pair<ValueType, bool>;
// Used to construct fixed-size signatures: MakeSig().Returns(...).Params(...);
FixedSizeSignature<ValueType> MakeSig() {
return FixedSizeSignature<ValueType>{{}};
}
// Used to construct fixed-size signatures: MakeSig::Returns(...).Params(...);
using MakeSig = FixedSizeSignature<ValueType>;
enum MemoryType { kMemory32, kMemory64 };
......@@ -5022,9 +5020,9 @@ TEST_P(FunctionBodyDecoderTestOnBothMemoryTypes, MemoryGrow) {
// memory.grow is i64->i64 memory32.
Validate(is_memory64(), sigs.l_l(), {WASM_MEMORY_GROW(WASM_LOCAL_GET(0))});
// any other combination always fails.
auto sig_l_i = MakeSig().Returns(kWasmI64).Params(kWasmI32);
auto sig_l_i = MakeSig::Returns(kWasmI64).Params(kWasmI32);
ExpectFailure(&sig_l_i, {WASM_MEMORY_GROW(WASM_LOCAL_GET(0))});
auto sig_i_l = MakeSig().Returns(kWasmI32).Params(kWasmI64);
auto sig_i_l = MakeSig::Returns(kWasmI32).Params(kWasmI64);
ExpectFailure(&sig_i_l, {WASM_MEMORY_GROW(WASM_LOCAL_GET(0))});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment