From patchwork Mon May 18 13:39:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 473397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F02A014016A for ; Mon, 18 May 2015 23:41:13 +1000 (AEST) Received: from localhost ([::1]:40997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuLI6-0007Vt-7D for incoming@patchwork.ozlabs.org; Mon, 18 May 2015 09:41:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuLHh-0006rt-I8 for qemu-devel@nongnu.org; Mon, 18 May 2015 09:40:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YuLHc-0004t5-Rp for qemu-devel@nongnu.org; Mon, 18 May 2015 09:40:45 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:60110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuLHc-0004sv-LP for qemu-devel@nongnu.org; Mon, 18 May 2015 09:40:40 -0400 Received: from [188.85.25.42] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) (envelope-from ) id 1YuLHb-0006na-9v; Mon, 18 May 2015 15:40:39 +0200 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.84) (envelope-from ) id 1YuLHP-0004yd-Nf; Mon, 18 May 2015 15:40:27 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Mon, 18 May 2015 15:39:59 +0200 Message-Id: <1431956400-19091-2-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1431956400-19091-1-git-send-email-aurelien@aurel32.net> References: <1431956400-19091-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:bc8:30d7:101::1 Cc: Alexander Graf , Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH 2/3] target-s390x: optimize (negative-) abs computation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now that movcond exists, it's easy to write (negative-) absolute value using TCG code instead of an helper. Cc: Richard Henderson Cc: Alexander Graf Signed-off-by: Aurelien Jarno Reviewed-by: Richard Henderson --- target-s390x/helper.h | 2 -- target-s390x/int_helper.c | 22 ---------------------- target-s390x/translate.c | 16 ++++++++++++++-- 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 8d2c859..c4ec3f1 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -17,8 +17,6 @@ DEF_HELPER_4(mvst, i64, env, i64, i64, i64) DEF_HELPER_5(ex, i32, env, i32, i64, i64, i64) DEF_HELPER_FLAGS_1(abs_i32, TCG_CALL_NO_RWG_SE, i32, s32) DEF_HELPER_FLAGS_1(nabs_i32, TCG_CALL_NO_RWG_SE, s32, s32) -DEF_HELPER_FLAGS_1(abs_i64, TCG_CALL_NO_RWG_SE, i64, s64) -DEF_HELPER_FLAGS_1(nabs_i64, TCG_CALL_NO_RWG_SE, s64, s64) DEF_HELPER_FLAGS_4(stam, TCG_CALL_NO_WG, void, env, i32, i64, i32) DEF_HELPER_FLAGS_4(lam, TCG_CALL_NO_WG, void, env, i32, i64, i32) DEF_HELPER_4(mvcle, i32, env, i32, i64, i32) diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c index cb8dd98..f53723d 100644 --- a/target-s390x/int_helper.c +++ b/target-s390x/int_helper.c @@ -135,28 +135,6 @@ int32_t HELPER(nabs_i32)(int32_t val) } } -/* absolute value 64-bit */ -uint64_t HELPER(abs_i64)(int64_t val) -{ - HELPER_LOG("%s: val 0x%" PRIx64 "\n", __func__, val); - - if (val < 0) { - return -val; - } else { - return val; - } -} - -/* negative absolute value 64-bit */ -int64_t HELPER(nabs_i64)(int64_t val) -{ - if (val < 0) { - return val; - } else { - return -val; - } -} - /* count leading zeros, for find leftmost one */ uint64_t HELPER(clz)(uint64_t v) { diff --git a/target-s390x/translate.c b/target-s390x/translate.c index c297938..5898adb 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1304,7 +1304,13 @@ static ExitStatus help_branch(DisasContext *s, DisasCompare *c, static ExitStatus op_abs(DisasContext *s, DisasOps *o) { - gen_helper_abs_i64(o->out, o->in2); + TCGv_i64 z, n; + z = tcg_const_i64(0); + n = tcg_temp_new_i64(); + tcg_gen_neg_i64(n, o->in2); + tcg_gen_movcond_i64(TCG_COND_LT, o->out, o->in2, z, n, o->in2); + tcg_temp_free_i64(n); + tcg_temp_free_i64(z); return NO_EXIT; } @@ -2675,7 +2681,13 @@ static ExitStatus op_msdb(DisasContext *s, DisasOps *o) static ExitStatus op_nabs(DisasContext *s, DisasOps *o) { - gen_helper_nabs_i64(o->out, o->in2); + TCGv_i64 z, n; + z = tcg_const_i64(0); + n = tcg_temp_new_i64(); + tcg_gen_neg_i64(n, o->in2); + tcg_gen_movcond_i64(TCG_COND_GE, o->out, o->in2, z, n, o->in2); + tcg_temp_free_i64(n); + tcg_temp_free_i64(z); return NO_EXIT; }