Skip to content

Annotate asm statements with attributes #2648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinNowak merged 2 commits into from
Oct 31, 2014
Merged

Annotate asm statements with attributes #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f75fa8
Return bare asm-instructions from helper functions
9rnsr Oct 29, 2014
ae5c00b
Annotate asm statements with attributes
9rnsr Oct 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion std/internal/math/biguintcore.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2053,7 +2053,7 @@ void schoolbookDivMod(BigDigit [] quotient, BigDigit [] u, in BigDigit [] v)
{
// Note: On DMD, this is only ~10% faster than the non-asm code.
uint *p = &u[j + v.length - 1];
asm
asm pure nothrow
{
mov EAX, p;
mov EDX, [EAX+4];
Expand Down
142 changes: 71 additions & 71 deletions std/internal/math/biguintx86.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ uint multibyteAddSub(char op)(uint[] dest, const uint [] src1, const uint []
// a resister (AL), and restoring it after the branch.

enum { LASTPARAM = 4*4 } // 3* pushes + return address.
asm {
asm pure nothrow {
naked;
push EDI;
push EBX;
Expand All @@ -138,13 +138,13 @@ uint multibyteAddSub(char op)(uint[] dest, const uint [] src1, const uint []
L_unrolled:
shr AL, 1; // get carry from EAX
}
mixin(" asm {"
mixin(" asm pure nothrow {"
~ indexedLoopUnroll( 8,
"mov EAX, [@*4-8*4+EDX+ECX*4];"
~ ( op == '+' ? "adc" : "sbb" ) ~ " EAX, [@*4-8*4+ESI+ECX*4];"
~ "mov [@*4-8*4+EDI+ECX*4], EAX;")
~ "}");
asm {
asm pure nothrow {
setc AL; // save carry
add ECX, 8;
ja L_unrolled;
Expand All @@ -155,12 +155,12 @@ L2: // Do the residual 1..7 ints.
L_residual:
shr AL, 1; // get carry from EAX
}
mixin(" asm {"
mixin(" asm pure nothrow {"
~ indexedLoopUnroll( 1,
"mov EAX, [@*4+EDX+ECX*4];"
~ ( op == '+' ? "adc" : "sbb" ) ~ " EAX, [@*4+ESI+ECX*4];"
~ "mov [@*4+EDI+ECX*4], EAX;") ~ "}");
asm {
asm pure nothrow {
setc AL; // save carry
add ECX, 1;
jnz L_residual;
Expand Down Expand Up @@ -222,18 +222,18 @@ unittest
uint multibyteIncrementAssign(char op)(uint[] dest, uint carry) pure
{
enum { LASTPARAM = 1*4 } // 0* pushes + return address.
asm {
asm pure nothrow {
naked;
mov ECX, [ESP + LASTPARAM + 0*4]; // dest.length;
mov EDX, [ESP + LASTPARAM + 1*4]; // dest.ptr
// EAX = carry
L1: ;
}
static if (op=='+')
asm { add [EDX], EAX; }
asm pure nothrow { add [EDX], EAX; }
else
asm { sub [EDX], EAX; }
asm {
asm pure nothrow { sub [EDX], EAX; }
asm pure nothrow {
mov EAX, 1;
jnc L2;
add EDX, 4;
Expand All @@ -255,7 +255,7 @@ uint multibyteShlNoMMX(uint [] dest, const uint [] src, uint numbits) pure
// 2.0 cycles/int on PPro..PM (limited by execution port p0)
// 5.0 cycles/int on Athlon, which has 7 cycles for SHLD!!
enum { LASTPARAM = 4*4 } // 3* pushes + return address.
asm {
asm pure nothrow {
naked;
push ESI;
push EDI;
Expand Down Expand Up @@ -293,7 +293,7 @@ L_last:
pop EDI;
pop ESI;
ret 4*4;
}
}
}

/** dest[#] = src[#] >> numbits
Expand All @@ -305,8 +305,7 @@ uint multibyteShl(uint [] dest, const uint [] src, uint numbits) pure
// Timing:
// K7 1.2/int. PM 1.7/int P4 5.3/int
enum { LASTPARAM = 4*4 } // 3* pushes + return address.

asm {
asm pure nothrow {
naked;
push ESI;
push EDI;
Expand Down Expand Up @@ -381,13 +380,13 @@ L_length1:
psllq MM1, MM3;
movd [EDI], MM1;
jmp L_alldone;
}
}
}

void multibyteShr(uint [] dest, const uint [] src, uint numbits) pure
{
enum { LASTPARAM = 4*4 } // 3* pushes + return address.
asm {
asm pure nothrow {
naked;
push ESI;
push EDI;
Expand Down Expand Up @@ -465,7 +464,7 @@ L_length1:
movd [EDI +4*EBX], MM1;
jmp L_alldone;

}
}
}

/** dest[#] = src[#] >> numbits
Expand All @@ -477,7 +476,7 @@ void multibyteShrNoMMX(uint [] dest, const uint [] src, uint numbits) pure
// 2.0 cycles/int on PPro..PM (limited by execution port p0)
// Terrible performance on AMD64, which has 7 cycles for SHRD!!
enum { LASTPARAM = 4*4 } // 3* pushes + return address.
asm {
asm pure nothrow {
naked;
push ESI;
push EDI;
Expand Down Expand Up @@ -515,7 +514,7 @@ L_last:
pop EDI;
pop ESI;
ret 4*4;
}
}
}

unittest
Expand Down Expand Up @@ -577,7 +576,7 @@ uint multibyteMul(uint[] dest, const uint[] src, uint multiplier, uint carry)
{
__gshared int zero = 0;
}
asm {
asm pure nothrow {
naked;
push ESI;
push EDI;
Expand Down Expand Up @@ -617,7 +616,7 @@ L_odd:
pop EDI;
pop ESI;
ret 5*4;
}
}
}

unittest
Expand Down Expand Up @@ -653,8 +652,8 @@ string asmMulAdd_innerloop(string OP, string M_ADDRESS) pure {
// The first member of 'dest' which will be modified is [EDI+4*EBX].
// EAX must already contain the first member of 'src', [ESI+4*EBX].

version(D_PIC) { bool using_PIC = true; } else { bool using_PIC=false; }
return "asm {
version(D_PIC) { bool using_PIC = true; } else { bool using_PIC = false; }
return "
// Entry point for even length
add EBX, 1;
mov EBP, ECX; // carry
Expand Down Expand Up @@ -683,9 +682,9 @@ L1:
mov ECX, zero;
mov EAX, [ESI+4*EBX];
adc ECX, EDX;
" ~
(using_PIC ? "" : " mov storagenop, EDX; ") // make #uops in loop a multiple of 3, can't do this in PIC mode.
~ "
" ~
(using_PIC ? "" : " mov storagenop, EDX; ") // make #uops in loop a multiple of 3, can't do this in PIC mode.
~ "
mul int ptr [" ~ M_ADDRESS ~ "];
" ~ OP ~ " [-4+EDI+4*EBX], EBP;
mov EBP, zero;
Expand All @@ -698,12 +697,13 @@ L1:
jl L1;
L_done: " ~ OP ~ " [-8+EDI+4*EBX], ECX;
adc EBP, 0;
}";
";
// final carry is now in EBP
}

string asmMulAdd_enter_odd(string OP, string M_ADDRESS) pure {
return "asm {
string asmMulAdd_enter_odd(string OP, string M_ADDRESS) pure
{
return "
mul int ptr [" ~M_ADDRESS ~"];
mov EBP, zero;
add ECX, EAX;
Expand All @@ -713,7 +713,7 @@ return "asm {
add EBX, 2;
jl L1;
jmp L_done;
}";
";
}


Expand Down Expand Up @@ -751,7 +751,7 @@ uint multibyteMulAdd(char op)(uint [] dest, const uint [] src, uint
}

enum { LASTPARAM = 5*4 } // 4* pushes + return address.
asm {
asm pure nothrow {
naked;

push ESI;
Expand All @@ -771,19 +771,19 @@ uint multibyteMulAdd(char op)(uint [] dest, const uint [] src, uint
mov EAX, [ESI+4*EBX];
test EBX, 1;
jnz L_enter_odd;
}
// Main loop, with entry point for even length
mixin(asmMulAdd_innerloop(OP, "ESP+LASTPARAM"));
asm {
}
// Main loop, with entry point for even length
mixin("asm pure nothrow {" ~ asmMulAdd_innerloop(OP, "ESP+LASTPARAM") ~ "}");
asm pure nothrow {
mov EAX, EBP; // get final carry
pop EBP;
pop EBX;
pop EDI;
pop ESI;
ret 5*4;
}
}
L_enter_odd:
mixin(asmMulAdd_enter_odd(OP, "ESP+LASTPARAM"));
mixin("asm pure nothrow {" ~ asmMulAdd_enter_odd(OP, "ESP+LASTPARAM") ~ "}");
}

unittest
Expand Down Expand Up @@ -831,7 +831,7 @@ void multibyteMultiplyAccumulate(uint [] dest, const uint[] left,
}

enum { LASTPARAM = 6*4 } // 4* pushes + local + return address.
asm {
asm pure nothrow {
naked;

push ESI;
Expand Down Expand Up @@ -860,10 +860,10 @@ outer_loop:
mov EAX, [ESI+4*EBX];
test EBX, 1;
jnz L_enter_odd;
}
// -- Inner loop, with even entry point
mixin(asmMulAdd_innerloop("add", "ESP"));
asm {
}
// -- Inner loop, with even entry point
mixin("asm pure nothrow { " ~ asmMulAdd_innerloop("add", "ESP") ~ "}");
asm pure nothrow {
mov [-4+EDI+4*EBX], EBP;
add EDI, 4;
cmp EDI, [ESP + LASTPARAM + 4*0]; // is EDI = &dest[$]?
Expand All @@ -881,9 +881,9 @@ outer_done:
pop EDI;
pop ESI;
ret 6*4;
}
}
L_enter_odd:
mixin(asmMulAdd_enter_odd("add", "ESP"));
mixin("asm pure nothrow {" ~ asmMulAdd_enter_odd("add", "ESP") ~ "}");
}

/** dest[#] /= divisor.
Expand All @@ -909,7 +909,7 @@ uint multibyteDivAssign(uint [] dest, uint divisor, uint overflow) pure
// [ESP] = kinv (2^64 /divisor)
enum { LASTPARAM = 5*4 } // 4* pushes + return address.
enum { LOCALS = 2*4} // MASK, KINV
asm {
asm pure nothrow {
naked;

push ESI;
Expand Down Expand Up @@ -1024,35 +1024,35 @@ void multibyteAddDiagonalSquares(uint [] dest, const uint [] src) pure
improve it by moving the mov EAX after the adc [EDI], EAX. Probably not worthwhile.
*/
enum { LASTPARAM = 4*5 } // 4* pushes + return address.
asm {
naked;
push ESI;
push EDI;
push EBX;
push ECX;
mov EDI, [ESP + LASTPARAM + 4*3]; //dest.ptr;
mov EBX, [ESP + LASTPARAM + 4*0]; //src.length;
mov ESI, [ESP + LASTPARAM + 4*1]; //src.ptr;
lea EDI, [EDI + 8*EBX]; // EDI = end of dest
lea ESI, [ESI + 4*EBX]; // ESI = end of src
neg EBX; // count UP to zero.
xor ECX, ECX; // initial carry = 0.
asm pure nothrow {
naked;
push ESI;
push EDI;
push EBX;
push ECX;
mov EDI, [ESP + LASTPARAM + 4*3]; //dest.ptr;
mov EBX, [ESP + LASTPARAM + 4*0]; //src.length;
mov ESI, [ESP + LASTPARAM + 4*1]; //src.ptr;
lea EDI, [EDI + 8*EBX]; // EDI = end of dest
lea ESI, [ESI + 4*EBX]; // ESI = end of src
neg EBX; // count UP to zero.
xor ECX, ECX; // initial carry = 0.
L1:
mov EAX, [ESI + 4*EBX];
mul EAX, EAX;
shr CL, 1; // get carry
adc [EDI + 8*EBX], EAX;
adc [EDI + 8*EBX + 4], EDX;
setc CL; // save carry
inc EBX;
jnz L1;
mov EAX, [ESI + 4*EBX];
mul EAX, EAX;
shr CL, 1; // get carry
adc [EDI + 8*EBX], EAX;
adc [EDI + 8*EBX + 4], EDX;
setc CL; // save carry
inc EBX;
jnz L1;

pop ECX;
pop EBX;
pop EDI;
pop ESI;
ret 4*4;
}
}
}

unittest
Expand Down Expand Up @@ -1111,7 +1111,7 @@ void multibyteTriangleAccumulateAsm(uint[] dest, const uint[] src) pure
}

enum { LASTPARAM = 6*4 } // 4* pushes + local + return address.
asm {
asm pure nothrow {
naked;

push ESI;
Expand Down Expand Up @@ -1155,8 +1155,8 @@ outer_loop:
jnz L_enter_odd;
}
// -- Inner loop, with even entry point
mixin(asmMulAdd_innerloop("add", "ESP"));
asm {
mixin("asm pure nothrow { " ~ asmMulAdd_innerloop("add", "ESP") ~ "}");
asm pure nothrow {
mov [-4+EDI+4*EBX], EBP;
add EDI, 4;
cmp EDI, [ESP + LASTPARAM + 4*2]; // is EDI = &dest[$-3]?
Expand Down Expand Up @@ -1191,8 +1191,8 @@ length_is_3:
pop ESI;
ret 4*4;
}
L_enter_odd:
mixin(asmMulAdd_enter_odd("add", "ESP"));
L_enter_odd:
mixin("asm pure nothrow {" ~ asmMulAdd_enter_odd("add", "ESP") ~ "}");
}

unittest
Expand Down