[ia32] Propagate rmodes when computing MemoryOperands

test/cctest/wasm/test-run-wasm-asmjs.cc

 // Copyright 2016 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 <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "src/base/platform/elapsed-timer.h"
 
 #include "src/wasm/wasm-macro-gen.h"
 
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/value-helper.h"
 #include "test/cctest/wasm/test-signatures.h"
 #include "test/cctest/wasm/wasm-run-utils.h"
 
 using namespace v8::base;
 using namespace v8::internal;
 using namespace v8::internal::compiler;
 using namespace v8::internal::wasm;
 
 // for even shorter tests.
 #define B2(a, b) kExprBlock, a, b, kExprEnd
 #define B1(a) kExprBlock, a, kExprEnd
 #define RET(x) x, kExprReturn, 1
 #define RET_I8(x) kExprI8Const, x, kExprReturn, 1
 
+#define IF_COMPILED(expr)                   \
+  if (execution_mode == kExecuteCompiled) { \
+    expr;                                   \
+  }
+
+namespace {
+uint32_t GetMatchingRelocInfoCount(Handle<Code> code, RelocInfo::Mode rmode) {
+  int filter = 1 << rmode;
+  uint32_t ret = 0;
+  for (RelocIterator it(*code, filter); !it.done(); it.next()) {
+    ++ret;
+  }
+  return ret;
+}
+}
+
 WASM_EXEC_TEST(Int32AsmjsDivS) {
   WasmRunner<int32_t> r(execution_mode, MachineType::Int32(),
                         MachineType::Int32());
   BUILD(r, WASM_BINOP(kExprI32AsmjsDivS, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(0, r.Call(0, 100));
   CHECK_EQ(0, r.Call(100, 0));
   CHECK_EQ(0, r.Call(-1001, 0));
   CHECK_EQ(kMin, r.Call(kMin, -1));
   CHECK_EQ(0, r.Call(kMin, 0));
@@ skipping 76 matching lines @@
 }
 
 WASM_EXEC_TEST(LoadMemI32_oob_asm) {
   TestingModule module(execution_mode);
   int32_t* memory = module.AddMemoryElems<int32_t>(8);
   WasmRunner<int32_t> r(&module, MachineType::Uint32());
   module.RandomizeMemory(1112);
 
   BUILD(r, WASM_UNOP(kExprI32AsmjsLoadMem, WASM_GET_LOCAL(0)));
 
+  IF_COMPILED(

[bradnelson, 2016/06/12 20:50:14]

Worth making these separate from the oob test? This is kind of mixing concerns.

[Mircea Trofin, 2016/06/13 03:33:09]

Good point, thanks. Added a battery of tests for the asm-wasm reloc stuff.

+      CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0],
+                                            RelocInfo::WASM_MEMORY_REFERENCE)));
   memory[0] = 999999;
   CHECK_EQ(999999, r.Call(0u));
   // TODO(titzer): offset 29-31 should also be OOB.
   for (uint32_t offset = 32; offset < 40; offset++) {
     CHECK_EQ(0, r.Call(offset));
   }
 
   for (uint32_t offset = 0x80000000; offset < 0x80000010; offset++) {
     CHECK_EQ(0, r.Call(offset));
   }
 }
 
 WASM_EXEC_TEST(LoadMemF32_oob_asm) {
   TestingModule module(execution_mode);
   float* memory = module.AddMemoryElems<float>(8);
   WasmRunner<float> r(&module, MachineType::Uint32());
   module.RandomizeMemory(1112);
 
   BUILD(r, WASM_UNOP(kExprF32AsmjsLoadMem, WASM_GET_LOCAL(0)));
 
+  IF_COMPILED(
+      CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0],
+                                            RelocInfo::WASM_MEMORY_REFERENCE)));
+
   memory[0] = 9999.5f;
   CHECK_EQ(9999.5f, r.Call(0u));
   // TODO(titzer): offset 29-31 should also be OOB.
   for (uint32_t offset = 32; offset < 40; offset++) {
     CHECK(std::isnan(r.Call(offset)));
   }
 
   for (uint32_t offset = 0x80000000; offset < 0x80000010; offset++) {
     CHECK(std::isnan(r.Call(offset)));
   }
 }
 
 WASM_EXEC_TEST(LoadMemF64_oob_asm) {
   TestingModule module(execution_mode);
   double* memory = module.AddMemoryElems<double>(8);
   WasmRunner<double> r(&module, MachineType::Uint32());
   module.RandomizeMemory(1112);
 
   BUILD(r, WASM_UNOP(kExprF64AsmjsLoadMem, WASM_GET_LOCAL(0)));
 
+  IF_COMPILED(
+      CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0],
+                                            RelocInfo::WASM_MEMORY_REFERENCE)));
+
   memory[0] = 9799.5;
   CHECK_EQ(9799.5, r.Call(0u));
   memory[1] = 11799.25;
   CHECK_EQ(11799.25, r.Call(8u));
   // TODO(titzer): offset 57-63 should also be OOB.
   for (uint32_t offset = 64; offset < 80; offset++) {
     CHECK(std::isnan(r.Call(offset)));
   }
 
   for (uint32_t offset = 0x80000000; offset < 0x80000010; offset++) {
     CHECK(std::isnan(r.Call(offset)));
   }
 }
 
 WASM_EXEC_TEST(StoreMemI32_oob_asm) {
   TestingModule module(execution_mode);
   int32_t* memory = module.AddMemoryElems<int32_t>(8);
   WasmRunner<int32_t> r(&module, MachineType::Uint32(), MachineType::Uint32());
   module.RandomizeMemory(1112);
 
   BUILD(r, WASM_BINOP(kExprI32AsmjsStoreMem, WASM_GET_LOCAL(0),
                       WASM_GET_LOCAL(1)));
 
+  IF_COMPILED(
+      CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0],
+                                            RelocInfo::WASM_MEMORY_REFERENCE)));
+
   memory[0] = 7777;
   CHECK_EQ(999999, r.Call(0u, 999999));
   CHECK_EQ(999999, memory[0]);
   // TODO(titzer): offset 29-31 should also be OOB.
   for (uint32_t offset = 32; offset < 40; offset++) {
     CHECK_EQ(8888, r.Call(offset, 8888));
   }
 
   for (uint32_t offset = 0x10000000; offset < 0xF0000000; offset += 0x1000000) {
     CHECK_EQ(7777, r.Call(offset, 7777));
   }
 }