From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7E9H-0001XH-F5 for qemu-devel@nongnu.org; Wed, 16 Nov 2016 23:18:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7E9E-0002RR-Af for qemu-devel@nongnu.org; Wed, 16 Nov 2016 23:18:07 -0500 Date: Thu, 17 Nov 2016 14:09:46 +1100 From: David Gibson Message-ID: <20161117030946.GA18808@umbus.fritz.box> References: <1479324335-2074-1-git-send-email-rth@twiddle.net> <1479324335-2074-8-git-send-email-rth@twiddle.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="+QahgC5+KEYLbs62" Content-Disposition: inline In-Reply-To: <1479324335-2074-8-git-send-email-rth@twiddle.net> Subject: Re: [Qemu-devel] [PATCH 07/25] target-ppc: Use clz and ctz opcodes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org --+QahgC5+KEYLbs62 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 16, 2016 at 08:25:17PM +0100, Richard Henderson wrote: > Cc: qemu-ppc@nongnu.org > Cc: David Gibson > Signed-off-by: Richard Henderson Reviewed-by: David Gibson > --- > target-ppc/helper.h | 4 ---- > target-ppc/int_helper.c | 20 -------------------- > target-ppc/translate.c | 20 ++++++++++++++++---- > 3 files changed, 16 insertions(+), 28 deletions(-) >=20 > diff --git a/target-ppc/helper.h b/target-ppc/helper.h > index da00f0a..1ed1d2c 100644 > --- a/target-ppc/helper.h > +++ b/target-ppc/helper.h > @@ -38,16 +38,12 @@ DEF_HELPER_4(divde, i64, env, i64, i64, i32) > DEF_HELPER_4(divweu, tl, env, tl, tl, i32) > DEF_HELPER_4(divwe, tl, env, tl, tl, i32) > =20 > -DEF_HELPER_FLAGS_1(cntlzw, TCG_CALL_NO_RWG_SE, tl, tl) > -DEF_HELPER_FLAGS_1(cnttzw, TCG_CALL_NO_RWG_SE, tl, tl) > DEF_HELPER_FLAGS_1(popcntb, TCG_CALL_NO_RWG_SE, tl, tl) > DEF_HELPER_FLAGS_1(popcntw, TCG_CALL_NO_RWG_SE, tl, tl) > DEF_HELPER_FLAGS_2(cmpb, TCG_CALL_NO_RWG_SE, tl, tl, tl) > DEF_HELPER_3(sraw, tl, env, tl, tl) > #if defined(TARGET_PPC64) > DEF_HELPER_FLAGS_2(cmpeqb, TCG_CALL_NO_RWG_SE, i32, tl, tl) > -DEF_HELPER_FLAGS_1(cntlzd, TCG_CALL_NO_RWG_SE, tl, tl) > -DEF_HELPER_FLAGS_1(cnttzd, TCG_CALL_NO_RWG_SE, tl, tl) > DEF_HELPER_FLAGS_1(popcntd, TCG_CALL_NO_RWG_SE, tl, tl) > DEF_HELPER_FLAGS_2(bpermd, TCG_CALL_NO_RWG_SE, i64, i64, i64) > DEF_HELPER_3(srad, tl, env, tl, tl) > diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c > index 9ac204a..a6486ce 100644 > --- a/target-ppc/int_helper.c > +++ b/target-ppc/int_helper.c > @@ -141,16 +141,6 @@ uint64_t helper_divde(CPUPPCState *env, uint64_t rau= , uint64_t rbu, uint32_t oe) > #endif > =20 > =20 > -target_ulong helper_cntlzw(target_ulong t) > -{ > - return clz32(t); > -} > - > -target_ulong helper_cnttzw(target_ulong t) > -{ > - return ctz32(t); > -} > - > #if defined(TARGET_PPC64) > /* if x =3D 0xab, returns 0xababababababababa */ > #define pattern(x) (((x) & 0xff) * (~(target_ulong)0 / 0xff)) > @@ -174,16 +164,6 @@ uint32_t helper_cmpeqb(target_ulong ra, target_ulong= rb) > #undef haszero > #undef hasvalue > =20 > -target_ulong helper_cntlzd(target_ulong t) > -{ > - return clz64(t); > -} > - > -target_ulong helper_cnttzd(target_ulong t) > -{ > - return ctz64(t); > -} > - > /* Return invalid random number. > * > * FIXME: Add rng backend or other mechanism to get cryptographically su= itable > diff --git a/target-ppc/translate.c b/target-ppc/translate.c > index 435c6f0..1224f56 100644 > --- a/target-ppc/translate.c > +++ b/target-ppc/translate.c > @@ -1641,7 +1641,13 @@ static void gen_andis_(DisasContext *ctx) > /* cntlzw */ > static void gen_cntlzw(DisasContext *ctx) > { > - gen_helper_cntlzw(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)]= ); > + TCGv_i32 t =3D tcg_temp_new_i32(); > + > + tcg_gen_trunc_tl_i32(t, cpu_gpr[rS(ctx->opcode)]); > + tcg_gen_clzi_i32(t, t, 32); > + tcg_gen_extu_i32_tl(cpu_gpr[rA(ctx->opcode)], t); > + tcg_temp_free_i32(t); > + > if (unlikely(Rc(ctx->opcode) !=3D 0)) > gen_set_Rc0(ctx, cpu_gpr[rA(ctx->opcode)]); > } > @@ -1649,7 +1655,13 @@ static void gen_cntlzw(DisasContext *ctx) > /* cnttzw */ > static void gen_cnttzw(DisasContext *ctx) > { > - gen_helper_cnttzw(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)]= ); > + TCGv_i32 t =3D tcg_temp_new_i32(); > + > + tcg_gen_trunc_tl_i32(t, cpu_gpr[rS(ctx->opcode)]); > + tcg_gen_ctzi_i32(t, t, 32); > + tcg_gen_extu_i32_tl(cpu_gpr[rA(ctx->opcode)], t); > + tcg_temp_free_i32(t); > + > if (unlikely(Rc(ctx->opcode) !=3D 0)) { > gen_set_Rc0(ctx, cpu_gpr[rA(ctx->opcode)]); > } > @@ -1891,7 +1903,7 @@ GEN_LOGICAL1(extsw, tcg_gen_ext32s_tl, 0x1E, PPC_64= B); > /* cntlzd */ > static void gen_cntlzd(DisasContext *ctx) > { > - gen_helper_cntlzd(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)]= ); > + tcg_gen_clzi_i64(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)],= 64); > if (unlikely(Rc(ctx->opcode) !=3D 0)) > gen_set_Rc0(ctx, cpu_gpr[rA(ctx->opcode)]); > } > @@ -1899,7 +1911,7 @@ static void gen_cntlzd(DisasContext *ctx) > /* cnttzd */ > static void gen_cnttzd(DisasContext *ctx) > { > - gen_helper_cnttzd(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)]= ); > + tcg_gen_ctzi_i64(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)],= 64); > if (unlikely(Rc(ctx->opcode) !=3D 0)) { > gen_set_Rc0(ctx, cpu_gpr[rA(ctx->opcode)]); > } --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --+QahgC5+KEYLbs62 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYLR93AAoJEGw4ysog2bOS7OMQAKfJXIEWAS/94LHYJageoYYB VPw1/7m8flk8VjG6iRoKR0fGNP/px5yWHmlN6tWvwX6TFD8JZurxM/rBCqxskHqX ynb0D8YfyXFEiXytqP3WI8SjRwIQFwHrCNcNfRGRDUI98ZI+ne/vCtVqE96OR7ll k7M1gaYLpQLQsbbX03oRP3oagvY4xTPm1mOSHWlc2IyZgCgmHb2sN6E6RFd7BStK NEdNV11fhbxva+Mw0YkQNAfjREbnURPJcbpMho+pUlezAjze30/SAHDFkqyYyAxV njxAbXGvQe9GzDZu34qWBKYvuu78+K7s+J9EgBZyjvQN3GEPmTJevK0RNVtKwhjl LyJdjSAgd8zDJFIwBY5SDaaHUuX++avzm2LNB3STxNNQKt9uMmnU8BYZp2NrwQCd Hi4QSmURcdWU9P6r3aKYvNN+WiSIFWf07GJAmEMUkvxKpsVhIVpiP5rCi9gLbwMC GvJyLAgc5seoF3z6CJWWXgYzv9JI+BEnHCoWWkNY1Yl4GilyB94EJA/SYeU6tYYf E5puGdePfyKfoj09hFsEnfoMn/pt855XSYFMCkCQarHwEerpC+M9QjRjJbWljtjp +KKHat21kqcsWp1UC/eVl/G5kCf8Rmpk4sc7h7EZFK3p/hSzv9uMhstXpvO/SjRb y5qt1umqh4Aa5ZYjXdeQ =Qct6 -----END PGP SIGNATURE----- --+QahgC5+KEYLbs62--