Changeset 88

Timestamp:

03/21/07 07:01:22 (2 years ago)

Author:

Don Clugston

Message:

Support *=. Support real scalars. Tracks FP stack usage. Identifies vector lengths, when known.

Files:

• trunk/mathextra/Blade.d (modified) (12 diffs)

trunk/mathextra/Blade.d

@@ -8 +8 @@
-*  - Supports any mix of vector addition, subtraction, dot product, and multiplication
-*    by a scalar.
+*  - 80-bit precision is used whereever possible (and it does not reduce execturion speed).
-*  - Supports mixed-length operations (eg, real[] + double[] + float[]).
-*  - When static arrays are used, mismatches in array length are detected at compile time.
@@ -17 +18 @@
-*
-* BUGS:
-
-optimal for 80-bit vectors (can save an instruction by changing float + real into real+float
+ No unit tests are included!
+always optimal for 80-bit vectors (can save an instruction by changing float[] + real[] into real[]+float[]
-*  - Not optimal for the case of multiple real vectors (they could share a counter).
-
-
+
-*  - Doesn't take advantage of length being known at compile time (loop unrolling
-*     is possible).
@@ -92 +92 @@
-    // ... and add it to all variables in the second expression, adding
-    // parentheses if required.
-.length==1
+=="a"
-    ret ~= op ~ "(";
-    for (int i=0; i<second.length; ++i) {
@@ -124 +124 @@
-    static if (operations[$-2]=='*') {
-        // Already a scalar multiply, so constant fold it.
-double
+real
-            return VectorExpr!(operations, knownlength, B)(values[0..$-1], x*values[$-1]);
-        }
-    } else {
-double) opMul(double
-double
+real) opMul(real
+real
-        }
-    }
@@ -168 +168 @@
-        performOperation!(expr.ops, "-=", len==0? expr.len : len, expr.ValueTuple, X[])(expr.values, values);
-    }
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-    VectorExpr!("a+b", knownlength==0 ? T:knownlength, X[], Q[]) opAdd(int T, Q)(Q[T] w) {
@@ -253 +254 @@
-    else static if (is(A == double[])) const char [] singleType = "D";
-    else static if (is(A == float[]))  const char [] singleType = "F";
-double
+real
-    else const char [] singleType = "?";
-}
@@ -274 +275 @@
-
-
-
-
-
-
+
+
+
-}
-
@@ -338 +338 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
-const char [][5] VectorRegisters = ["EAX", "ECX", "EDX", "EBX", "EDI"];
-
@@ -370 +380 @@
-else static if (real.sizeof==12) const char [] REALSIZE="12";
-else static if (real.sizeof==16) const char [] REALSIZE="16";
+
+char [] storeVector(char type, int vecnum, char [] stride="")
+{
+    if (type=='R') {
+        return "  fstp real ptr [" ~ vectorRegister(vecnum) ~ stride ~ "];"\n;
+    } else {
+        return "  fstp " ~ operandSize(type) ~ " [" ~ vectorRegister(vecnum) ~ " + " ~ vectorSize_LEA(type) ~ stride ~ "];"\n;
+    }
+}
-
-// Generate asm code which is optimal for x87 CPUs without SSE2
@@ -385 +404 @@
-    bool firstvec=true;
-    int vecnum = 0;
+    int scalarnum = 0;
-    for (int i=0; i< typelist.length;++i) {
-        if (typelist[i]=='S'){
-
+
+
-        } else {
-vecnum
+i
-            if (typelist[i]=='R') {
-                incrementRealVectors ~= "  add " ~ vectorRegister(vecnum) ~ ", " ~ REALSIZE ~ ";\n";
@@ -401 +422 @@
-    }
-    assert(vecnum-1 < VectorRegisters.length, "Too many vectors!");
-
-    bool isDotProduct = (operations[$-1]=='.');
+    int numScalarsOnStack=0;
-
-    result~= \n"asm {"\n ~ pushRegisters(vecnum) ~
-        "  mov ESI, veclength;"\n; // ESI will be the counter
-
-
+
+
-    int numvecs=0;
+    int numconsts=0;
-    for (int i=0; i<typelist.length; ++i) {
-, i+'a'
-isRealVector(typelist, i+'a')
-vec" ~ itoa(numvecs
+[i]
+typelist[i]=='R'
+dword ptr vec" ~ itoa(i
-          } else  {
-            result ~= "  lea " ~ vectorRegister(numvecs) ~ ", ["
-"\n
-numvecs
+   "
+i
-         }
-        ++numvecs;
+      } else {
+          result ~= "  fld real ptr var"~ itoa(i) ~";\n";
+          ++numconsts;
+          ++numScalarsOnStack;
-      }
-    }
-
+
+
-    result ~= "  xor ESI, ESI; "\n
-        "  sub ESI, veclength; // counter=-length"\n
-        "  jz short L3; // test for length==0"\n;
-
+
+
+
+
+
-    int done=0;
-
-    char [] mainbody = "";
+    char [] firstbody = "";
+    int numOnStack = 0; // How much of the FP stack is being used?
-
-if (operations.length>1) {
-    while(done<operations.length) {
+        char [] next;
-      if (isInstruction(operations[done])) {
-
+
+
-            ++done;
+            numOnStack--;
-      } else if (!isInstruction(operations[done+1])){
-            int u  = operations[done]-'a';
-
+
+
-            ++done;
-
-
+
+
+
-             // 80-bit vectors must be loaded onto the FPU stack first
-mainbody ~= "  fld real ptr ["  ~ vectorRegister(vectorNum(typelist, operations[done])) ~ "];\n";
-mainbody ~=
+next = "  fld real ptr ["  ~ vectorRegister(vectorNum(typelist, operations[done])) ~ "];\n"
+    ~
-         } else {
-mainbody ~
+next 
-              ~ indexedVector(typelist, operations[done] ) ~ ";\n";
-        }
+        mainbody ~= next; firstbody ~= next;
-        done +=2;
-      } else { // multiply by scalar
-
+
+
+
+
+
-            done +=2;
-      }
-    }
+} else {
+    char [] next;
+    if (typelist[$-1]=='R')
+        next = "  fld real ptr ["  ~ vectorRegister(0) ~ "];\n";
+    else next = "  fld "  ~ indexedVector(typelist, operations[0]) ~ ";\n";
+    mainbody ~=next; firstbody~=next;
+    ++numOnStack;
-}
-    if (!isDotProduct && finaloperation.length>1) {
-
-
+
+
+
+
+
-            char [] finalop = "fadd";
-            if (finaloperation[0]=='-') finalop="fsubr";
-             if (typelist[$-1]=='R') {
-                 // 80-bit vectors must be loaded onto the FPU stack first
-
-
+
-                mainbody ~= "  " ~ finalop ~ "p ST(1), ST;\n";
-             } else {
@@ -471 +524 @@
-        }
-    }
-main
-
+first
+  align 4;\n" ~ "
-
-    result ~= "  fxch ST(1), ST;\n"; // get previous result
-    if (isDotProduct) result ~= "  faddp ST(2), ST;"\n;
-
+
+
+
-
-    result ~= "L2: \n";
-
-    result~= incrementRealVectors ~ "  inc ESI;\n  jnz L1;\n";
+
-    if (isDotProduct) result ~= "  faddp ST(1), ST;"\n;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    result~= "L3:" \n ~ popRegisters(vecnum) ~ "}\r\n";
-    return result;