[AArch64][5/5] Cleanup immediate generation code in aarch64_internal_mov_immediate

2015-09-20  Wilco Dijkstra  <wdijkstr@arm.com>

	* config/aarch64/aarch64.c (aarch64_internal_mov_immediate): Cleanup
	immediate generation code.

From-SVN: r227950
This commit is contained in:
Wilco Dijkstra 2015-09-20 16:46:12 +00:00 committed by Jiong Wang
parent feca59ff11
commit 9a4865db76
2 changed files with 44 additions and 98 deletions

View File

@ -1,3 +1,8 @@
2015-09-20 Wilco Dijkstra <wdijkstr@arm.com>
* config/aarch64/aarch64.c (aarch64_internal_mov_immediate): Cleanup
immediate generation code.
2015-09-20 Wilco Dijkstra <wdijkstr@arm.com> 2015-09-20 Wilco Dijkstra <wdijkstr@arm.com>
* config/aarch64/aarch64.c (aarch64_internal_mov_immediate): Remove * config/aarch64/aarch64.c (aarch64_internal_mov_immediate): Remove

View File

@ -1433,75 +1433,42 @@ static int
aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate,
machine_mode mode) machine_mode mode)
{ {
unsigned HOST_WIDE_INT mask;
int i; int i;
bool first; unsigned HOST_WIDE_INT val, val2, mask;
unsigned HOST_WIDE_INT val, val2; int one_match, zero_match;
int one_match, zero_match, first_not_ffff_match; int num_insns;
int num_insns = 0;
if (CONST_INT_P (imm) && aarch64_move_imm (INTVAL (imm), mode)) val = INTVAL (imm);
if (aarch64_move_imm (val, mode))
{ {
if (generate) if (generate)
emit_insn (gen_rtx_SET (dest, imm)); emit_insn (gen_rtx_SET (dest, imm));
num_insns++; return 1;
return num_insns;
} }
if (mode == SImode) if ((val >> 32) == 0 || mode == SImode)
{ {
/* We know we can't do this in 1 insn, and we must be able to do it
in two; so don't mess around looking for sequences that don't buy
us anything. */
if (generate) if (generate)
{ {
emit_insn (gen_rtx_SET (dest, GEN_INT (INTVAL (imm) & 0xffff))); emit_insn (gen_rtx_SET (dest, GEN_INT (val & 0xffff)));
emit_insn (gen_insv_immsi (dest, GEN_INT (16), if (mode == SImode)
GEN_INT ((INTVAL (imm) >> 16) & 0xffff))); emit_insn (gen_insv_immsi (dest, GEN_INT (16),
GEN_INT ((val >> 16) & 0xffff)));
else
emit_insn (gen_insv_immdi (dest, GEN_INT (16),
GEN_INT ((val >> 16) & 0xffff)));
} }
num_insns += 2; return 2;
return num_insns;
} }
/* Remaining cases are all for DImode. */ /* Remaining cases are all for DImode. */
val = INTVAL (imm);
one_match = 0;
zero_match = 0;
mask = 0xffff; mask = 0xffff;
first_not_ffff_match = -1; zero_match = ((val & mask) == 0) + ((val & (mask << 16)) == 0) +
((val & (mask << 32)) == 0) + ((val & (mask << 48)) == 0);
for (i = 0; i < 64; i += 16, mask <<= 16) one_match = ((~val & mask) == 0) + ((~val & (mask << 16)) == 0) +
{ ((~val & (mask << 32)) == 0) + ((~val & (mask << 48)) == 0);
if ((val & mask) == mask)
one_match++;
else
{
if (first_not_ffff_match < 0)
first_not_ffff_match = i;
if ((val & mask) == 0)
zero_match++;
}
}
if (one_match == 2)
{
/* Set one of the quarters and then insert back into result. */
mask = 0xffffll << first_not_ffff_match;
if (generate)
{
emit_insn (gen_rtx_SET (dest, GEN_INT (val | mask)));
emit_insn (gen_insv_immdi (dest, GEN_INT (first_not_ffff_match),
GEN_INT ((val >> first_not_ffff_match)
& 0xffff)));
}
num_insns += 2;
return num_insns;
}
if (zero_match == 2)
goto simple_sequence;
if (zero_match != 2 && one_match != 2) if (zero_match != 2 && one_match != 2)
{ {
@ -1529,58 +1496,32 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate,
{ {
emit_insn (gen_rtx_SET (dest, GEN_INT (val2))); emit_insn (gen_rtx_SET (dest, GEN_INT (val2)));
emit_insn (gen_insv_immdi (dest, GEN_INT (i), emit_insn (gen_insv_immdi (dest, GEN_INT (i),
GEN_INT ((val >> i) & 0xffff))); GEN_INT ((val >> i) & 0xffff)));
} }
return 2;
} }
} }
if (one_match > zero_match) /* Generate 2-4 instructions, skipping 16 bits of all zeroes or ones which
{ are emitted by the initial mov. If one_match > zero_match, skip set bits,
/* Set either first three quarters or all but the third. */ otherwise skip zero bits. */
mask = 0xffffll << (16 - first_not_ffff_match);
if (generate)
emit_insn (gen_rtx_SET (dest,
GEN_INT (val | mask | 0xffffffff00000000ull)));
num_insns ++;
/* Now insert other two quarters. */ num_insns = 1;
for (i = first_not_ffff_match + 16, mask <<= (first_not_ffff_match << 1);
i < 64; i += 16, mask <<= 16)
{
if ((val & mask) != mask)
{
if (generate)
emit_insn (gen_insv_immdi (dest, GEN_INT (i),
GEN_INT ((val >> i) & 0xffff)));
num_insns ++;
}
}
return num_insns;
}
simple_sequence:
first = true;
mask = 0xffff; mask = 0xffff;
for (i = 0; i < 64; i += 16, mask <<= 16) val2 = one_match > zero_match ? ~val : val;
i = (val2 & mask) != 0 ? 0 : (val2 & (mask << 16)) != 0 ? 16 : 32;
if (generate)
emit_insn (gen_rtx_SET (dest, GEN_INT (one_match > zero_match
? (val | ~(mask << i))
: (val & (mask << i)))));
for (i += 16; i < 64; i += 16)
{ {
if ((val & mask) != 0) if ((val2 & (mask << i)) == 0)
{ continue;
if (first) if (generate)
{ emit_insn (gen_insv_immdi (dest, GEN_INT (i),
if (generate) GEN_INT ((val >> i) & 0xffff)));
emit_insn (gen_rtx_SET (dest, GEN_INT (val & mask))); num_insns ++;
num_insns ++;
first = false;
}
else
{
if (generate)
emit_insn (gen_insv_immdi (dest, GEN_INT (i),
GEN_INT ((val >> i) & 0xffff)));
num_insns ++;
}
}
} }
return num_insns; return num_insns;