Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1392)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: test/cctest/interpreter/test-bytecode-generator.cc

Issue 1309843007: [Interpreter] Add support for property load operations. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/interpreter/bytecode-array-builder.cc ('K') | « src/interpreter/interpreter.cc ('k') | test/cctest/interpreter/test-interpreter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/cctest/interpreter/test-bytecode-generator.cc
diff --git a/test/cctest/interpreter/test-bytecode-generator.cc b/test/cctest/interpreter/test-bytecode-generator.cc
index a9eb58aa3aa84c300a3c4d47ac57251bf7f4c7bf..d30142bff73efb6f3ec128d0838a7630336c7954 100644
--- a/test/cctest/interpreter/test-bytecode-generator.cc
+++ b/test/cctest/interpreter/test-bytecode-generator.cc
@@ -17,6 +17,9 @@ class BytecodeGeneratorHelper {
public:
const char* kFunctionName = "f";
+ const int kLastParamIndex =
+ -InterpreterFrameConstants::kLastParamFromRegisterPointer / kPointerSize;
+
BytecodeGeneratorHelper() {
i::FLAG_ignition = true;
i::FLAG_ignition_filter = kFunctionName;
@@ -24,6 +27,9 @@ class BytecodeGeneratorHelper {
}
+ Factory* factory() { return CcTest::i_isolate()->factory(); }
+
+
Handle<BytecodeArray> MakeBytecode(const char* script,
const char* function_name) {
CompileRun(script);
@@ -52,11 +58,11 @@ class BytecodeGeneratorHelper {
// Structure for containing expected bytecode snippets.
template<typename T>
struct ExpectedSnippet {
- const char* body;
+ const char* code_snippet;
int frame_size;
int parameter_count;
int bytecode_length;
- const uint8_t bytecode[16];
+ const uint8_t bytecode[24];
int constant_count;
T constants[16];
};
@@ -87,7 +93,7 @@ TEST(PrimitiveReturnStatements) {
size_t num_snippets = sizeof(snippets) / sizeof(snippets[0]);
for (size_t i = 0; i < num_snippets; i++) {
Handle<BytecodeArray> ba =
- helper.MakeBytecodeForFunctionBody(snippets[i].body);
+ helper.MakeBytecodeForFunctionBody(snippets[i].code_snippet);
CHECK_EQ(ba->frame_size(), snippets[i].frame_size);
CHECK_EQ(ba->parameter_count(), snippets[i].parameter_count);
CHECK_EQ(ba->length(), snippets[i].bytecode_length);
@@ -134,7 +140,7 @@ TEST(PrimitiveExpressions) {
size_t num_snippets = sizeof(snippets) / sizeof(snippets[0]);
for (size_t i = 0; i < num_snippets; i++) {
Handle<BytecodeArray> ba =
- helper.MakeBytecodeForFunctionBody(snippets[i].body);
+ helper.MakeBytecodeForFunctionBody(snippets[i].code_snippet);
CHECK_EQ(ba->frame_size(), snippets[i].frame_size);
CHECK_EQ(ba->parameter_count(), snippets[i].parameter_count);
CHECK_EQ(ba->length(), snippets[i].bytecode_length);
@@ -149,24 +155,23 @@ TEST(Parameters) {
InitializedHandleScope handle_scope;
BytecodeGeneratorHelper helper;
- int last_param_index =
- -InterpreterFrameConstants::kLastParamFromRegisterPointer / kPointerSize;
ExpectedSnippet<void*> snippets[] = {
{"function f() { return this; }",
- 0, 1, 3, {B(Ldar), R(last_param_index), B(Return)}, 0},
+ 0, 1, 3, {B(Ldar), R(helper.kLastParamIndex), B(Return)}, 0},
{"function f(arg1) { return arg1; }",
- 0, 2, 3, {B(Ldar), R(last_param_index), B(Return)}, 0},
+ 0, 2, 3, {B(Ldar), R(helper.kLastParamIndex), B(Return)}, 0},
{"function f(arg1) { return this; }",
- 0, 2, 3, {B(Ldar), R(last_param_index - 1), B(Return)}, 0},
+ 0, 2, 3, {B(Ldar), R(helper.kLastParamIndex - 1), B(Return)}, 0},
{"function f(arg1, arg2, arg3, arg4, arg5, arg6, arg7) { return arg4; }",
- 0, 8, 3, {B(Ldar), R(last_param_index - 3), B(Return)}, 0},
+ 0, 8, 3, {B(Ldar), R(helper.kLastParamIndex - 3), B(Return)}, 0},
{"function f(arg1, arg2, arg3, arg4, arg5, arg6, arg7) { return this; }",
- 0, 8, 3, {B(Ldar), R(last_param_index - 7), B(Return)}, 0}
+ 0, 8, 3, {B(Ldar), R(helper.kLastParamIndex - 7), B(Return)}, 0}
};
size_t num_snippets = sizeof(snippets) / sizeof(snippets[0]);
for (size_t i = 0; i < num_snippets; i++) {
- Handle<BytecodeArray> ba = helper.MakeBytecodeForFunction(snippets[i].body);
+ Handle<BytecodeArray> ba =
+ helper.MakeBytecodeForFunction(snippets[i].code_snippet);
CHECK_EQ(ba->frame_size(), snippets[i].frame_size);
CHECK_EQ(ba->parameter_count(), snippets[i].parameter_count);
CHECK_EQ(ba->length(), snippets[i].bytecode_length);
@@ -212,7 +217,7 @@ TEST(Constants) {
size_t num_snippets = sizeof(snippets) / sizeof(snippets[0]);
for (size_t i = 0; i < num_snippets; i++) {
Handle<BytecodeArray> ba =
- helper.MakeBytecodeForFunctionBody(snippets[i].body);
+ helper.MakeBytecodeForFunctionBody(snippets[i].code_snippet);
CHECK_EQ(ba->frame_size(), snippets[i].frame_size);
CHECK_EQ(ba->parameter_count(), snippets[i].parameter_count);
CHECK_EQ(ba->length(), snippets[i].bytecode_length);
@@ -261,7 +266,7 @@ TEST(Constants) {
size_t num_snippets = sizeof(snippets) / sizeof(snippets[0]);
for (size_t i = 0; i < num_snippets; i++) {
Handle<BytecodeArray> ba =
- helper.MakeBytecodeForFunctionBody(snippets[i].body);
+ helper.MakeBytecodeForFunctionBody(snippets[i].code_snippet);
CHECK_EQ(ba->frame_size(), snippets[i].frame_size);
CHECK_EQ(ba->parameter_count(), snippets[i].parameter_count);
CHECK_EQ(ba->length(), snippets[i].bytecode_length);
@@ -308,7 +313,7 @@ TEST(Constants) {
size_t num_snippets = sizeof(snippets) / sizeof(snippets[0]);
for (size_t i = 0; i < num_snippets; i++) {
Handle<BytecodeArray> ba =
- helper.MakeBytecodeForFunctionBody(snippets[i].body);
+ helper.MakeBytecodeForFunctionBody(snippets[i].code_snippet);
CHECK_EQ(ba->frame_size(), snippets[i].frame_size);
CHECK_EQ(ba->parameter_count(), snippets[i].parameter_count);
CHECK_EQ(ba->length(), snippets[i].bytecode_length);
@@ -316,9 +321,8 @@ TEST(Constants) {
ba->length()));
CHECK_EQ(ba->constant_pool()->length(), snippets[i].constant_count);
for (int j = 0; j < snippets[i].constant_count; j++) {
- Handle<String> expected =
- CcTest::i_isolate()->factory()->NewStringFromAsciiChecked(
- snippets[i].constants[j]);
+ Handle<String> expected = helper.factory()->NewStringFromAsciiChecked(
+ snippets[i].constants[j]);
CHECK(String::cast(ba->constant_pool()->get(j))->Equals(*expected));
}
}
@@ -326,6 +330,94 @@ TEST(Constants) {
}
+TEST(PropertyLoads) {
+ InitializedHandleScope handle_scope;
+ BytecodeGeneratorHelper helper;
+
+ Code::Kind ic_kinds[] = { i::Code::LOAD_IC, i::Code::LOAD_IC };
+ FeedbackVectorSpec feedback_spec(0, 1, ic_kinds);
+ Handle<i::TypeFeedbackVector> vector =
+ helper.factory()->NewTypeFeedbackVector(&feedback_spec);
+
+ ExpectedSnippet<const char*> snippets[] = {
mvstanton 2015/09/01 14:28:29 Nice test! Helps to explain what is happening...
rmcilroy 2015/09/01 15:53:36 Acknowledged.
+ {"function f(a) { return a.name; }\nf({name : \"test\"})",
+ 1 * kPointerSize, 2, 10,
+ {
+ B(LdaConstant), U8(0),
+ B(Star), R(0),
+ B(Ldar), R(helper.kLastParamIndex),
+ B(LoadIC), R(0), U8(vector->first_ic_slot_index()),
+ B(Return)
+ },
+ 1, { "name" }
+ },
+ {"function f(a) { return a[\"key\"]; }\nf({key : \"test\"})",
+ 1 * kPointerSize, 2, 10,
+ {
+ B(LdaConstant), U8(0),
+ B(Star), R(0),
+ B(Ldar), R(helper.kLastParamIndex),
+ B(LoadIC), R(0), U8(vector->first_ic_slot_index()),
+ B(Return)
+ },
+ 1, { "key" }
+ },
+ {"function f(a) { return a[100]; }\nf({100 : \"test\"})",
+ 1 * kPointerSize, 2, 10,
+ {
+ B(LdaSmi8), U8(100),
+ B(Star), R(0),
+ B(Ldar), R(helper.kLastParamIndex),
+ B(KeyedLoadIC), R(0), U8(vector->first_ic_slot_index()),
+ B(Return)
+ }, 0
+ },
+ {"function f(a, b) { return a[b]; }\nf({arg : \"test\"}, \"arg\")",
+ 1 * kPointerSize, 3, 10,
+ {
+ B(Ldar), R(helper.kLastParamIndex),
+ B(Star), R(0),
+ B(Ldar), R(helper.kLastParamIndex - 1),
+ B(KeyedLoadIC), R(0), U8(vector->first_ic_slot_index()),
+ B(Return)
+ }, 0
+ },
+ {"function f(a) { var b = a.name; return a[-124]; }\n"
+ "f({\"-124\" : \"test\", name : 123 })",
+ 2 * kPointerSize, 2, 21,
+ {
+ B(LdaConstant), U8(0),
+ B(Star), R(1),
+ B(Ldar), R(helper.kLastParamIndex),
+ B(LoadIC), R(1), U8(vector->first_ic_slot_index()),
+ B(Star), R(0),
+ B(LdaSmi8), U8(-124),
+ B(Star), R(1),
+ B(Ldar), R(helper.kLastParamIndex),
+ B(KeyedLoadIC), R(1), U8(vector->first_ic_slot_index() + 2),
+ B(Return)
+ },
+ 1, { "name" }
+ }
+ };
+ size_t num_snippets = sizeof(snippets) / sizeof(snippets[0]);
+ for (size_t i = 0; i < num_snippets; i++) {
+ Handle<BytecodeArray> ba =
+ helper.MakeBytecode(snippets[i].code_snippet, "f");
+ CHECK_EQ(ba->frame_size(), snippets[i].frame_size);
+ CHECK_EQ(ba->parameter_count(), snippets[i].parameter_count);
+ CHECK_EQ(ba->length(), snippets[i].bytecode_length);
+ CHECK(!memcmp(ba->GetFirstBytecodeAddress(), snippets[i].bytecode,
+ ba->length()));
+ CHECK_EQ(ba->constant_pool()->length(), snippets[i].constant_count);
+ for (int j = 0; j < snippets[i].constant_count; j++) {
+ Handle<String> expected = helper.factory()->NewStringFromAsciiChecked(
+ snippets[i].constants[j]);
+ CHECK(String::cast(ba->constant_pool()->get(j))->Equals(*expected));
+ }
+ }
+}
+
} // namespace interpreter
} // namespace internal
} // namespance v8
« src/interpreter/bytecode-array-builder.cc ('K') | « src/interpreter/interpreter.cc ('k') | test/cctest/interpreter/test-interpreter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698