[wasm] remove MachineType from asm-wasm-builder.cc

src/asmjs/asm-wasm-builder.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 // Required to get M_E etc. in MSVC.
 #if defined(_WIN32)
 #define _USE_MATH_DEFINES
 #endif
@@ skipping 737 matching lines @@
         return pos->second;
       } else {
         uint32_t index = builder_->builder_->AddImport(
             indices->name_, indices->name_length_, sig);
         indices->signature_to_index_[sig] = index;
         return index;
       }
     }
   };
 
-  void EmitAssignmentLhs(Expression* target, MachineType* mtype) {
+  void EmitAssignmentLhs(Expression* target, AsmType** atype) {
     // Match the left hand side of the assignment.
     VariableProxy* target_var = target->AsVariableProxy();
     if (target_var != nullptr) {
       // Left hand side is a local or a global variable, no code on LHS.
       return;
     }
 
     Property* target_prop = target->AsProperty();
     if (target_prop != nullptr) {
       // Left hand side is a property access, i.e. the asm.js heap.
-      VisitPropertyAndEmitIndex(target_prop, mtype);
+      VisitPropertyAndEmitIndex(target_prop, atype);
       return;
     }
 
     if (target_var == nullptr && target_prop == nullptr) {
       UNREACHABLE();  // invalid assignment.
     }
   }
 
   void EmitAssignmentRhs(Expression* target, Expression* value, bool* is_nop) {
     BinaryOperation* binop = value->AsBinaryOperation();
@@ skipping 27 matching lines @@
         if (target_var != nullptr && effective_value_var != nullptr &&
             target_var->var() == effective_value_var->var()) {
           *is_nop = true;
           return;
         }
       }
     }
     RECURSE(Visit(value));
   }
 
-  void EmitAssignment(Assignment* expr, MachineType type, ValueFate fate) {
+  void EmitAssignment(Assignment* expr, AsmType* type, ValueFate fate) {
     // Match the left hand side of the assignment.
     VariableProxy* target_var = expr->target()->AsVariableProxy();
     if (target_var != nullptr) {
       // Left hand side is a local or a global variable.
       Variable* var = target_var->var();
       LocalType var_type = TypeOf(expr);
       DCHECK_NE(kAstStmt, var_type);
       if (var->IsContextSlot()) {
         uint32_t index = LookupOrInsertGlobal(var, var_type);
         current_function_builder_->EmitWithVarInt(kExprSetGlobal, index);
@@ skipping 14 matching lines @@
     Property* target_prop = expr->target()->AsProperty();
     if (target_prop != nullptr) {
       // Left hand side is a property access, i.e. the asm.js heap.
       if (TypeOf(expr->value()) == kAstF64 && expr->target()->IsProperty() &&
           typer_->TypeOf(expr->target()->AsProperty()->obj())
               ->IsA(AsmType::Float32Array())) {
         current_function_builder_->Emit(kExprF32ConvertF64);
       }
       // Note that unlike StoreMem, AsmjsStoreMem ignores out-of-bounds writes.
       WasmOpcode opcode;
-      if (type == MachineType::Int8()) {
+      if (type->IsA(AsmType::Int8Array())) {

[bradnelson, 2016/11/02 13:24:22]

IsA is more expensive (since it has a bunch of fallbacks) so this isn't
surprising.
For basic types these should have unique values.
You should be able to do:
type == AsmType::Int8Array()  etc for these.

Though maybe we should do something specific in asm-types.h.
I'll CC jpp on this and see what he thinks.

[aseemgarg, 2016/11/02 19:40:01]

Done.

         opcode = kExprI32AsmjsStoreMem8;
-      } else if (type == MachineType::Uint8()) {
+      } else if (type->IsA(AsmType::Uint8Array())) {
         opcode = kExprI32AsmjsStoreMem8;
-      } else if (type == MachineType::Int16()) {
+      } else if (type->IsA(AsmType::Int16Array())) {
         opcode = kExprI32AsmjsStoreMem16;
-      } else if (type == MachineType::Uint16()) {
+      } else if (type->IsA(AsmType::Uint16Array())) {
         opcode = kExprI32AsmjsStoreMem16;
-      } else if (type == MachineType::Int32()) {
+      } else if (type->IsA(AsmType::Int32Array())) {
         opcode = kExprI32AsmjsStoreMem;
-      } else if (type == MachineType::Uint32()) {
+      } else if (type->IsA(AsmType::Uint32Array())) {
         opcode = kExprI32AsmjsStoreMem;
-      } else if (type == MachineType::Float32()) {
+      } else if (type->IsA(AsmType::Float32Array())) {
         opcode = kExprF32AsmjsStoreMem;
-      } else if (type == MachineType::Float64()) {
+      } else if (type->IsA(AsmType::Float64Array())) {
         opcode = kExprF64AsmjsStoreMem;
       } else {
         UNREACHABLE();
       }
       current_function_builder_->Emit(opcode);
       if (fate == kDrop) {
         // Asm.js stores to memory leave their result on the stack.
         current_function_builder_->Emit(kExprDrop);
       }
     }
@@ skipping 46 matching lines @@
         return;
       }
       if (expr->value()->IsCallNew()) {
         // No init code to emit for CallNew nodes.
         return;
       }
       as_init = true;
     }
 
     if (as_init) LoadInitFunction();
-    MachineType mtype = MachineType::None();
+    AsmType* atype = AsmType::None();
     bool is_nop = false;
-    EmitAssignmentLhs(expr->target(), &mtype);
+    EmitAssignmentLhs(expr->target(), &atype);
     EmitAssignmentRhs(expr->target(), expr->value(), &is_nop);
     if (!is_nop) {
-      EmitAssignment(expr, mtype, fate);
+      EmitAssignment(expr, atype, fate);
     }
     if (as_init) UnLoadInitFunction();
   }
 
   void VisitYield(Yield* expr) { UNREACHABLE(); }
 
   void VisitThrow(Throw* expr) { UNREACHABLE(); }
 
   void VisitForeignVariable(bool is_float, Variable* var, Property* expr) {
     DCHECK(expr->obj()->AsVariableProxy());
     DCHECK(VariableLocation::PARAMETER ==
            expr->obj()->AsVariableProxy()->var()->location());
     DCHECK_EQ(1, expr->obj()->AsVariableProxy()->var()->index());
     Literal* key_literal = expr->key()->AsLiteral();
     DCHECK_NOT_NULL(key_literal);
     if (!key_literal->value().is_null()) {
       Handle<Name> name =
           i::Object::ToName(isolate_, key_literal->value()).ToHandleChecked();
       LocalType type = is_float ? kAstF64 : kAstI32;
       foreign_variables_.push_back({name, var, type});
     }
   }
 
-  void VisitPropertyAndEmitIndex(Property* expr, MachineType* mtype) {
+  void VisitPropertyAndEmitIndex(Property* expr, AsmType** atype) {
     Expression* obj = expr->obj();
     AsmType* type = typer_->TypeOf(obj);
+    *atype = type;
     int size;
     if (type->IsA(AsmType::Uint8Array())) {

[bradnelson, 2016/11/02 13:24:22]

Switch this to calling:

size = type->ElementSizeInBytes();

IsA is not as cheap (it permits more doesn't turn into a switch).

[aseemgarg, 2016/11/02 19:40:01]

Done.

-      *mtype = MachineType::Uint8();
       size = 1;
     } else if (type->IsA(AsmType::Int8Array())) {
-      *mtype = MachineType::Int8();
       size = 1;
     } else if (type->IsA(AsmType::Uint16Array())) {
-      *mtype = MachineType::Uint16();
       size = 2;
     } else if (type->IsA(AsmType::Int16Array())) {
-      *mtype = MachineType::Int16();
       size = 2;
     } else if (type->IsA(AsmType::Uint32Array())) {
-      *mtype = MachineType::Uint32();
       size = 4;
     } else if (type->IsA(AsmType::Int32Array())) {
-      *mtype = MachineType::Int32();
-      size = 4;
-    } else if (type->IsA(AsmType::Uint32Array())) {
-      *mtype = MachineType::Uint32();
       size = 4;
     } else if (type->IsA(AsmType::Float32Array())) {
-      *mtype = MachineType::Float32();
       size = 4;
     } else if (type->IsA(AsmType::Float64Array())) {
-      *mtype = MachineType::Float64();
       size = 8;
     } else {
       UNREACHABLE();
     }
     if (size == 1) {
       // Allow more general expression in byte arrays than the spec
       // strictly permits.
       // Early versions of Emscripten emit HEAP8[HEAP32[..]|0] in
       // places that strictly should be HEAP8[HEAP32[..]>>0].
       RECURSE(Visit(expr->key()));
@@ skipping 21 matching lines @@
       byte mask = static_cast<byte>(~(size - 1));
       RECURSE(Visit(binop->left()));
       current_function_builder_->EmitWithU8(kExprI8Const, mask);
       current_function_builder_->Emit(kExprI32And);
       return;
     }
     UNREACHABLE();
   }
 
   void VisitProperty(Property* expr) {
-    MachineType type;
+    AsmType* type = AsmType::None();
     VisitPropertyAndEmitIndex(expr, &type);
     WasmOpcode opcode;
-    if (type == MachineType::Int8()) {
+    if (type->IsA(AsmType::Int8Array())) {

[bradnelson, 2016/11/02 13:24:22]

Same as above, IsA isn't cheap.

[aseemgarg, 2016/11/02 19:40:01]

Done.

       opcode = kExprI32AsmjsLoadMem8S;
-    } else if (type == MachineType::Uint8()) {
+    } else if (type->IsA(AsmType::Uint8Array())) {
       opcode = kExprI32AsmjsLoadMem8U;
-    } else if (type == MachineType::Int16()) {
+    } else if (type->IsA(AsmType::Int16Array())) {
       opcode = kExprI32AsmjsLoadMem16S;
-    } else if (type == MachineType::Uint16()) {
+    } else if (type->IsA(AsmType::Uint16Array())) {
       opcode = kExprI32AsmjsLoadMem16U;
-    } else if (type == MachineType::Int32()) {
+    } else if (type->IsA(AsmType::Int32Array())) {
       opcode = kExprI32AsmjsLoadMem;
-    } else if (type == MachineType::Uint32()) {
+    } else if (type->IsA(AsmType::Uint32Array())) {
       opcode = kExprI32AsmjsLoadMem;
-    } else if (type == MachineType::Float32()) {
+    } else if (type->IsA(AsmType::Float32Array())) {
       opcode = kExprF32AsmjsLoadMem;
-    } else if (type == MachineType::Float64()) {
+    } else if (type->IsA(AsmType::Float64Array())) {
       opcode = kExprF64AsmjsLoadMem;
     } else {
       UNREACHABLE();
     }
 
     current_function_builder_->Emit(opcode);
   }
 
   bool VisitStdlibFunction(Call* call, VariableProxy* expr) {
     Variable* var = expr->var();
@@ skipping 824 matching lines @@
   impl.builder_->WriteAsmJsOffsetTable(*asm_offsets_buffer);
   return {module_buffer, asm_offsets_buffer};
 }
 
 const char* AsmWasmBuilder::foreign_init_name = "__foreign_init__";
 const char* AsmWasmBuilder::single_function_name = "__single_function__";
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8