Skip to content

Commit

Permalink
more of AArch64 cdcvt implemented (#20814)
Browse files Browse the repository at this point in the history
  • Loading branch information
@WalterBright
WalterBright authored Feb 3, 2025
1 parent 6e249f0 commit e132fb4
Show file tree
Hide file tree
Showing 5 changed files with 87 additions and 12 deletions.
63 changes: 59 additions & 4 deletions compiler/src/dmd/backend/arm/cod4.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1264,8 +1264,10 @@ void cdcnvt(ref CGstate cg, ref CodeBuilder cdb,elem* e, ref regm_t pretregs)
case OPd_u64: // fcvtzu d31,d31 // fmov x0,d31
L2:
regm_t retregs1 = ALLREGS; //INSTR.FLOATREGS;
retregs1 = mCX; // hack because no floating support in rest of code
// codelem(cgstate,cdb,e.E1,retregs1,false);
static if (1)
retregs1 = mCX; // hack because no floating support in rest of code
else
codelem(cgstate,cdb,e.E1,retregs1,false);
const reg_t V1 = findreg(retregs1); // source floating point register

regm_t retregs = pretregs & cg.allregs;
Expand Down Expand Up @@ -1307,6 +1309,59 @@ retregs1 = mCX; // hack because no floating support in rest of code
fixresult(cdb,e,retregs,pretregs);
break;

case OPs16_d: // sxth w0,w0 // scvtf d31,w0
case OPs32_d: // scvtf d31,w0
case OPs64_d: // scvtf d31,x0
case OPu16_d: // and w0,w0,#0xFFFF // ucvtf d31,w0
case OPu32_d: // ucvtf d31,w0
case OPu64_d: // ucvtf d31,x0
regm_t retregs1 = ALLREGS;
codelem(cgstate,cdb,e.E1,retregs1,false);
reg_t R1 = findreg(retregs1);

static if (1)
{
regm_t retregs = mCX; // hack because no floating support in rest of code
reg_t Rd = CX;
}
else
{
regm_t retregs = FLOATREGS;
const tym = tybasic(e.Ety);
reg_t Rd = allocreg(cdb,retregs,tym); // destination integer register
}
switch (e.Eoper)
{
case OPs16_d:
cdb.gen1(INSTR.sxth_sbfm(0,R1,R1)); // sxth w0,w0
cdb.gen1(INSTR.scvtf_float_int(0,1,Rd,R1)); // scvtf d31,w0
break;
case OPs32_d:
cdb.gen1(INSTR.scvtf_float_int(0,1,Rd,R1)); // scvtf d31,w0
break;
case OPs64_d:
cdb.gen1(INSTR.scvtf_float_int(1,1,Rd,R1)); // scvtf d31,x0
break;
case OPu16_d:
/* not executed because OPu16_d was converted to OPu16_32 then OP32_d */
uint N,immr,imms;
assert(encodeNImmrImms(0xFFFF,N,immr,imms));
cdb.gen1(INSTR.log_imm(0,0,0,immr,imms,R1,R1)); // and w0,w0,#0xFFFF
cdb.gen1(INSTR.ucvtf_float_int(0,1,Rd,R1)); // ucvtf d31,w0
break;
case OPu32_d:
cdb.gen1(INSTR.ucvtf_float_int(0,1,Rd,R1)); // ucvtf d31,w0
break;
case OPu64_d:
cdb.gen1(INSTR.ucvtf_float_int(1,1,Rd,R1)); // ucvtf d31,x0
break;
default:
assert(0);
}

fixresult(cdb,e,retregs,pretregs);
break;

default:
assert(0);
}
Expand Down Expand Up @@ -1456,7 +1511,7 @@ void cdshtlng(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
{
uint N,immr,imms;
assert(encodeNImmrImms(0xFFFF,N,immr,imms));
uint ins = INSTR.log_imm(0,0,N,immr,imms,reg,reg); // AND Xreg,Xreg,#0xFFFF
uint ins = INSTR.log_imm(0,0,0,immr,imms,reg,reg); // AND Xreg,Xreg,#0xFFFF
cdb.gen1(ins);
}
else
Expand Down Expand Up @@ -1497,7 +1552,7 @@ void cdshtlng(ref CGstate cg, ref CodeBuilder cdb,elem* e,ref regm_t pretregs)
{
uint N,immr,imms;
assert(encodeNImmrImms(0xFFFF,N,immr,imms));
uint ins = INSTR.log_imm(0,0,N,immr,imms,reg,reg); // AND reg,reg,#0xFFFF
uint ins = INSTR.log_imm(0,0,0,immr,imms,reg,reg); // AND reg,reg,#0xFFFF
cdb.gen1(ins);
}
else
Expand Down
10 changes: 9 additions & 1 deletion compiler/src/dmd/backend/arm/disasmarm.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1979,6 +1979,12 @@ void disassemble(uint c) @trusted
p2 = fregString(rbuf[4 .. 8],"sd h"[ftype],Rd);
p3 = regString(sf,Rn);
}
else if (S == 0 && rmode == 0 && (opcode & ~1) == 2)
{
p1 = opcode & 1 ? "ucvtf" : "scvtf";
p2 = fregString(rbuf[4 .. 8],"sd h"[ftype],Rd);
p3 = regString(sf,Rn);
}
}
}
else
Expand Down Expand Up @@ -2803,8 +2809,10 @@ unittest
unittest
{
int line64 = __LINE__;
string[73] cases64 = // 64 bit code gen
string[75] cases64 = // 64 bit code gen
[
"1E 62 00 1F scvtf d31,w0",
"1E 63 00 1F ucvtf d31,w0",
"5E E1 BB FE fcvtzs d30,d31",
"5E A1 BB FF fcvtzs s31,s31",
"1E 78 03 E0 fcvtzs w0,d31",
Expand Down
9 changes: 9 additions & 0 deletions compiler/src/dmd/backend/arm/instr.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,15 @@ struct INSTR
*/
static uint fcvtzu(uint sf, uint ftype, reg_t Rn, reg_t Rd) { return float2int(sf, 0, ftype, 3, 1, Rn, Rd); }

/* SCVTF (scalar, integer) https://www.scs.stanford.edu/~zyedidia/arm64/scvtf_float_int.html
*/
static uint scvtf_float_int(uint sf, uint ftype, reg_t Rn, reg_t Rd) { return float2int(sf,0,ftype,0,2,Rn,Rd); }

/* UCVTF (scalar, integer) https://www.scs.stanford.edu/~zyedidia/arm64/ucvtf_float_int.html
*/
static uint ucvtf_float_int(uint sf, uint ftype, reg_t Rn, reg_t Rd) { return float2int(sf,0,ftype,0,3,Rn,Rd); }


/* Floating-point data-processing (1 source)
* https://www.scs.stanford.edu/~zyedidia/arm64/encodingindex.html#floatdp1
*/
Expand Down
3 changes: 3 additions & 0 deletions compiler/src/dmd/backend/cgelem.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5207,6 +5207,9 @@ private elem* elu64_d(elem* e, Goal goal)
if (!pu || (*pu).Eoper == OPconst)
return evalu8(e, goal);

if (config.target_cpu == TARGET_AArch64)
return e;

elem* u = *pu;
if (config.fpxmmregs && I64 && (ty == TYfloat || ty == TYdouble))
{
Expand Down
14 changes: 7 additions & 7 deletions compiler/src/dmd/backend/inliner.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,15 +518,15 @@ private elem* initializeParamsWithArgs(elem* eargs, SYMIDX sistart, SYMIDX siend
auto s2 = nextSymbol(si);
if (!s2)
{
for (size_t m = args.length; m; --m)
{
elem* ex = args[m - 1];
printf("arg[%d]\n", cast(int) m);
elem_print(ex);
}
for (size_t m = args.length; m; --m)
{
elem* ex = args[m - 1];
printf("arg[%d]\n", cast(int) m);
elem_print(ex);
}

printf("function: %s\n", funcsym_p.Sident.ptr);
printf("szs: %d sze: %d\n", cast(int)szs, cast(int)sze);
printf("szs: %d sze: %d\n", cast(int)szs, cast(int)sze);
printf("detected slice with %s\n", s.Sident.ptr);
symbol_print(*s); elem_print(e); assert(0);
}
Expand Down

0 comments on commit e132fb4

Please sign in to comment.