Changeset 2736 in webkit

Timestamp:

Nov 18, 2002, 1:55:23 PM (23 years ago)

Author:

darin

Message:

• fix worst speed problems on the sort page of the iBench JavaScript test

Sped up JavaScript iBench by 70%, the sort page by 88%.

• kjs/array_object.h: Add array-specific sort functions.
• kjs/array_object.cpp: (compareByStringForQSort): Added. (ArrayInstanceImp::sort): Added. (compareWithCompareFunctionForQSort): Added. (ArrayProtoFuncImp::call): Use ArrayInstanceImp::sort if the object being sorted is actually an array.

• kjs/object.h: Add argumentsPropertyName.
• kjs/object.cpp: Add argumentsPropertyName.
• kjs/function.cpp: (FunctionImp::FunctionImp): Use argumentsPropertyName to avoid making a UString. (FunctionImp::call): Ditto. (ActivationImp::ActivationImp): Ditto.
• kjs/function_object.cpp: (FunctionObjectImp::construct): Ditto.

• kjs/ustring.h: Added compare function for -1/0/+1 comparison.
• kjs/ustring.cpp: (KJS::compare): Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ChangeLog-2002-12-03 (modified) (1 diff)
• ChangeLog-2003-10-25 (modified) (1 diff)
• kjs/array_object.cpp (modified) (2 diffs)
• kjs/array_object.h (modified) (1 diff)
• kjs/function.cpp (modified) (4 diffs)
• kjs/function_object.cpp (modified) (1 diff)
• kjs/object.cpp (modified) (1 diff)
• kjs/object.h (modified) (1 diff)
• kjs/ustring.cpp (modified) (1 diff)
• kjs/ustring.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2002-11-18  Darin Adler  <[email protected]>
+
+        - fix worst speed problems on the sort page of the iBench JavaScript test
+
+        Sped up JavaScript iBench by 70%, the sort page by 88%.
+
+        * kjs/array_object.h: Add array-specific sort functions.
+        * kjs/array_object.cpp:
+        (compareByStringForQSort): Added.
+        (ArrayInstanceImp::sort): Added.
+        (compareWithCompareFunctionForQSort): Added.
+        (ArrayProtoFuncImp::call): Use ArrayInstanceImp::sort if the object being
+        sorted is actually an array.
+
+        * kjs/object.h: Add argumentsPropertyName.
+        * kjs/object.cpp: Add argumentsPropertyName.
+        * kjs/function.cpp:
+        (FunctionImp::FunctionImp): Use argumentsPropertyName to avoid making a UString.
+        (FunctionImp::call): Ditto.
+        (ActivationImp::ActivationImp): Ditto.
+        * kjs/function_object.cpp: (FunctionObjectImp::construct): Ditto.
+
+        * kjs/ustring.h: Added compare function for -1/0/+1 comparison.
+        * kjs/ustring.cpp: (KJS::compare): Added.
+
 2002-11-18  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2002-12-03

@@ +1 @@
+2002-11-18  Darin Adler  <[email protected]>
+
+        - fix worst speed problems on the sort page of the iBench JavaScript test
+
+        Sped up JavaScript iBench by 70%, the sort page by 88%.
+
+        * kjs/array_object.h: Add array-specific sort functions.
+        * kjs/array_object.cpp:
+        (compareByStringForQSort): Added.
+        (ArrayInstanceImp::sort): Added.
+        (compareWithCompareFunctionForQSort): Added.
+        (ArrayProtoFuncImp::call): Use ArrayInstanceImp::sort if the object being
+        sorted is actually an array.
+
+        * kjs/object.h: Add argumentsPropertyName.
+        * kjs/object.cpp: Add argumentsPropertyName.
+        * kjs/function.cpp:
+        (FunctionImp::FunctionImp): Use argumentsPropertyName to avoid making a UString.
+        (FunctionImp::call): Ditto.
+        (ActivationImp::ActivationImp): Ditto.
+        * kjs/function_object.cpp: (FunctionObjectImp::construct): Ditto.
+
+        * kjs/ustring.h: Added compare function for -1/0/+1 comparison.
+        * kjs/ustring.cpp: (KJS::compare): Added.
+
 2002-11-18  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2003-10-25

@@ +1 @@
+2002-11-18  Darin Adler  <[email protected]>
+
+        - fix worst speed problems on the sort page of the iBench JavaScript test
+
+        Sped up JavaScript iBench by 70%, the sort page by 88%.
+
+        * kjs/array_object.h: Add array-specific sort functions.
+        * kjs/array_object.cpp:
+        (compareByStringForQSort): Added.
+        (ArrayInstanceImp::sort): Added.
+        (compareWithCompareFunctionForQSort): Added.
+        (ArrayProtoFuncImp::call): Use ArrayInstanceImp::sort if the object being
+        sorted is actually an array.
+
+        * kjs/object.h: Add argumentsPropertyName.
+        * kjs/object.cpp: Add argumentsPropertyName.
+        * kjs/function.cpp:
+        (FunctionImp::FunctionImp): Use argumentsPropertyName to avoid making a UString.
+        (FunctionImp::call): Ditto.
+        (ActivationImp::ActivationImp): Ditto.
+        * kjs/function_object.cpp: (FunctionObjectImp::construct): Ditto.
+
+        * kjs/ustring.h: Added compare function for -1/0/+1 comparison.
+        * kjs/ustring.cpp: (KJS::compare): Added.
+
 2002-11-18  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -191 +191 @@
       imp->mark();
   }
+}
+
+static ExecState *execForCompareByStringForQSort;
+
+static int compareByStringForQSort(const void *a, const void *b)
+{
+    ExecState *exec = execForCompareByStringForQSort;
+    return compare(Value(*(ValueImp **)a).toString(exec), Value(*(ValueImp **)b).toString(exec));
+}
+
+void ArrayInstanceImp::sort(ExecState *exec)
+{
+    execForCompareByStringForQSort = exec;
+    qsort(storage, length, sizeof(ValueImp *), compareByStringForQSort);
+    execForCompareByStringForQSort = 0;
+}
+
+struct CompareWithCompareFunctionArguments {
+    CompareWithCompareFunctionArguments(ExecState *e, ObjectImp *cf)
+        : exec(e)
+        , compareFunction(cf)
+        , globalObject(e->interpreter()->globalObject())
+    { }
+
+    ExecState *exec;
+    ObjectImp *compareFunction;
+    List arguments;
+    Object globalObject;
+};
+
+static CompareWithCompareFunctionArguments *compareWithCompareFunctionArguments;
+
+static int compareWithCompareFunctionForQSort(const void *a, const void *b)
+{
+    CompareWithCompareFunctionArguments *args = compareWithCompareFunctionArguments;
+    
+    args->arguments.clear();
+    args->arguments.append(Value(*(ValueImp **)a));
+    args->arguments.append(Value(*(ValueImp **)b));
+    return args->compareFunction->call(args->exec, args->globalObject, args->arguments)
+        .toInt32(args->exec);
+}
+
+void ArrayInstanceImp::sort(ExecState *exec, Object &compareFunction)
+{
+    CompareWithCompareFunctionArguments args(exec, compareFunction.imp());
+    compareWithCompareFunctionArguments = &args;
+    qsort(storage, length, sizeof(ValueImp *), compareWithCompareFunctionForQSort);
+    compareWithCompareFunctionArguments = 0;
 }
 
@@ -425 +474 @@
           useSortFunction = false;
       }
+    
+    if (thisObj.imp()->classInfo() == &ArrayInstanceImp::info) {
+      if (useSortFunction)
+        ((ArrayInstanceImp *)thisObj.imp())->sort(exec, sortFunction);
+      else
+        ((ArrayInstanceImp *)thisObj.imp())->sort(exec);
+      result = thisObj;
+      break;
+    }
 
     if (length == 0) {
       thisObj.put(exec, lengthPropertyName, Number(0), DontEnum | DontDelete);
-      result = Undefined();
+      result = thisObj;
       break;
     }

trunk/JavaScriptCore/kjs/array_object.h

@@ -50 +50 @@
     unsigned getLength() const { return length; }
     
+    void sort(ExecState *exec);
+    void sort(ExecState *exec, Object &compareFunction);
+    
   private:
     void setLength(unsigned newLength);

trunk/JavaScriptCore/kjs/function.cpp

@@ -60 +60 @@
   Value protect(this);
   //fprintf(stderr,"FunctionImp::FunctionImp this=%p\n");
-  put(exec,"arguments",Null(),ReadOnly|DontDelete|DontEnum);
+  put(exec,argumentsPropertyName,Null(),ReadOnly|DontDelete|DontEnum);
 }
 
@@ -109 +109 @@
   // previous arguments object.
   // Note: this does not appear to be part of the spec
-  Value oldArgs = get(&newExec, "arguments");
+  Value oldArgs = get(&newExec, argumentsPropertyName);
 
   if (codeType() == FunctionCode) {
     assert(ctx.activationObject().inherits(&ActivationImp::info));
     Object argsObj = static_cast<ActivationImp*>(ctx.activationObject().imp())->argumentsObject();
-    put(&newExec, "arguments", argsObj, DontDelete|DontEnum|ReadOnly);
+    put(&newExec, argumentsPropertyName, argsObj, DontDelete|DontEnum|ReadOnly);
   }
 
@@ -128 +128 @@
     exec->setException(newExec.exception());
   if (codeType() == FunctionCode)
-    put(&newExec, "arguments", oldArgs, DontDelete|DontEnum|ReadOnly);
+    put(&newExec, argumentsPropertyName, oldArgs, DontDelete|DontEnum|ReadOnly);
 
 #ifdef KJS_VERBOSE
@@ -309 +309 @@
   Value protect(this);
   arguments = new ArgumentsImp(exec,f, args);
-  put(exec, "arguments", Object(arguments), Internal|DontDelete);
+  put(exec, argumentsPropertyName, Object(arguments), Internal|DontDelete);
 }
 

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -284 +284 @@
                 Object(fimp), DontEnum|DontDelete|ReadOnly);
   fimp->put(exec,prototypePropertyName,prototype,DontEnum|DontDelete|ReadOnly);
-  fimp->put(exec,"arguments",Null(),DontEnum|DontDelete|ReadOnly);
+  fimp->put(exec,argumentsPropertyName,Null(),DontEnum|DontDelete|ReadOnly);
   return ret;
 }

trunk/JavaScriptCore/kjs/object.cpp

@@ -42 +42 @@
 namespace KJS {
 
+extern const UString argumentsPropertyName("arguments");
 extern const UString lengthPropertyName("length");
 extern const UString prototypePropertyName("prototype");

trunk/JavaScriptCore/kjs/object.h

@@ -706 +706 @@
     { imp()->setInternalValue(v); }
 
+  extern const UString argumentsPropertyName;
   extern const UString lengthPropertyName;
   extern const UString prototypePropertyName;

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -643 +643 @@
   return (l1 < l2);
 }
+
+int KJS::compare(const UString& s1, const UString& s2)
+{
+  const int l1 = s1.size();
+  const int l2 = s2.size();
+  const int lmin = l1 < l2 ? l1 : l2;
+  const UChar *c1 = s1.data();
+  const UChar *c2 = s2.data();
+  int l = 0;
+  while (l < lmin && *c1 == *c2) {
+    c1++;
+    c2++;
+    l++;
+  }
+  if (l < lmin)
+    return (c1->unicode() > c2->unicode()) ? 1 : -1;
+
+  if (l1 == l2) {
+    return 0;
+  }
+  return (l1 < l2) ? 1 : -1;
+}

trunk/JavaScriptCore/kjs/ustring.h

@@ -431 +431 @@
     return UString(s1, s2);
   }
+  
+  int compare(const UString &, const UString &);
 
 }; // namespace