- Represent strings internally in UTF-16 format, this makes it

vm/benchmark_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/benchmark_test.h"
 
 #include "bin/file.h"
 
 #include "platform/assert.h"
 
@@ skipping 123 matching lines @@
   EXPECT_EQ(7, value2);
 
   // Return param + receiver.field.
   Dart_SetReturnValue(args, Dart_NewInteger(value1 * value2));
   Dart_ExitScope();
 }
 
 
 static Dart_NativeFunction bm_uda_lookup(Dart_Handle name, int argument_count) {
   const char* cstr = NULL;
-  Dart_Handle result = Dart_StringToCString(name, &cstr);
+  Dart_Handle result = Dart_StringAsCString(name, &cstr);
   EXPECT_VALID(result);
   if (strcmp(cstr, "init") == 0) {
     return InitNativeFields;
   } else {
     return UseDartApi;
   }
 }
 
 
 BENCHMARK(UseDartApi) {
@@ skipping 11 matching lines @@
       "    c.method(i,7);\n"
       "  }\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(
       kScriptChars,
       reinterpret_cast<Dart_NativeEntryResolver>(bm_uda_lookup));
 
   // Create a native wrapper class with native fields.
   Dart_Handle result = Dart_CreateNativeWrapperClass(
-      lib,
-      Dart_NewString("NativeFieldsWrapper"),
-      1);
+      lib, NewString("NativeFieldsWrapper"), 1);
   EXPECT_VALID(result);
 
   Dart_Handle args[1];
   args[0] = Dart_NewInteger(kNumIterations);
 
   // Warmup first to avoid compilation jitters.
-  Dart_Invoke(lib,
-              Dart_NewString("benchmark"),
-              1,
-              args);
+  Dart_Invoke(lib, NewString("benchmark"), 1, args);

[cshapiro, 2012/10/24 23:52:29]

Replace this with the macro expansion?

[siva, 2012/10/26 21:38:29]

NewString is now a method.

On 2012/10/24 23:52:29, cshapiro wrote:

 
   Timer timer(true, "UseDartApi benchmark");
   timer.Start();
-  Dart_Invoke(lib,
-              Dart_NewString("benchmark"),
-              1,
-              args);
+  Dart_Invoke(lib, NewString("benchmark"), 1, args);
   timer.Stop();
   int64_t elapsed_time = timer.TotalElapsedTime();
   benchmark->set_score(elapsed_time);
 }
 
 
 //
 // Measure time accessing internal and external strings.
 //
 BENCHMARK(DartStringAccess) {
   const int kNumIterations = 10000000;
   Timer timer(true, "DartStringAccess benchmark");
   timer.Start();
   Dart_EnterScope();
 
   // Create strings.
   uint8_t data8[] = { 'o', 'n', 'e', 0xFF };
   int external_peer_data = 123;
-  Dart_Handle external_string = Dart_NewExternalString8(data8,
-                                                        ARRAY_SIZE(data8),
-                                                        &external_peer_data,
-                                                        NULL);
-  Dart_Handle internal_string = Dart_NewString("two");
+  Dart_Handle external_string = Dart_NewExternalUTF8String(data8,
+                                                           ARRAY_SIZE(data8),
+                                                           &external_peer_data,
+                                                           NULL);
+  Dart_Handle internal_string = NewString("two");
 
   // Run benchmark.
   for (int64_t i = 0; i < kNumIterations; i++) {
     EXPECT(Dart_IsString(internal_string));
-    EXPECT(Dart_IsString8(internal_string));
-    EXPECT(Dart_IsString16(internal_string));
     EXPECT(!Dart_IsExternalString(internal_string));
     EXPECT_VALID(external_string);
     EXPECT(Dart_IsExternalString(external_string));
     void* external_peer = NULL;
     EXPECT_VALID(Dart_ExternalStringGetPeer(external_string, &external_peer));
     EXPECT_EQ(&external_peer_data, external_peer);
   }
 
   Dart_ExitScope();
   timer.Stop();
@@ skipping 145 matching lines @@
       "}"
       "class StackFrameTest {"
       "  static int testMain() {"
       "    First obj = new First();"
       "    return obj.method1(1);"
       "  }"
       "}";
   Dart_Handle lib = TestCase::LoadTestScript(
       kScriptChars,
       reinterpret_cast<Dart_NativeEntryResolver>(StackFrameNativeResolver));
-  Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("StackFrameTest"));
-  Dart_Handle result = Dart_Invoke(cls, Dart_NewString("testMain"), 0, NULL);
+  Dart_Handle cls = Dart_GetClass(lib, NewString("StackFrameTest"));
+  Dart_Handle result = Dart_Invoke(cls, NewString("testMain"), 0, NULL);
   EXPECT_VALID(result);
   int64_t elapsed_time = 0;
   result = Dart_IntegerToInt64(result, &elapsed_time);
   EXPECT_VALID(result);
   benchmark->set_score(elapsed_time);
 }
 
 }  // namespace dart