From patchwork Fri Jun 22 14:11:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 139668 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp952324lji; Fri, 22 Jun 2018 07:38:49 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdBjhYC7OxWpWLL9+SybxAt4ec5p2tugzkm1W0Ji379DREzQCXIarXbkslQzBHo+xoY7LEz X-Received: by 2002:a0c:aac7:: with SMTP id g7-v6mr1620822qvb.76.1529678329169; Fri, 22 Jun 2018 07:38:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529678329; cv=none; d=google.com; s=arc-20160816; b=ppU5UE5Y6RcEyaw6pzD5UlrwMpuksWLHzQTPHUVY+bXWeOdacWhnSFWCY616U8QgD8 DNC+h4g05gh7f6ddMt/+ApTLHwzrVFPIPVcU8nkIXf6yuzEWNcY7wfucgsEJKyFmi6OR op9wMQrN07PQdp+FL6WZLf1zK34z6MQ3svXAfmQcf/cyWwcScq4xF66J0/mydZmzNdfC 6xM+mdwrWe8bkenqyg5OR36I62DlbONQpI749s+l9nh5VPXDUSR/9Jo8jaiJ1ku71gph 1rF/7cJCcq8aJddvgLp2nydwwaBib3SojmiwyKKupgteFi3RLAqpsYYa6otjg10S0Y+p 3OFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=yGIXH0KQMm00dKEL2Etwd2IPZwUNEDVV+bNKLpa67ZE=; b=zCr2DjxO+c2wuNauaefa5WfOcgZz7cFSP5Hk/njmjgqtIlxIGoZYwZvLSaqQ9f/z4+ uO0u2xaAlcyzTD1FZ/SrmDwCscaA8O9+HWiO1Y7RuclW7a8FGEX3M1psishCM3wc/sJF V6cgZSxeECfutGApqK4RYawKuJ1smGC1xPY/jiVrlfiIIUhX7rumEbwBNajE5cC2k/dH fMHgaj9MdC3UkN/U7srh+ZlVUyQGuFBnF2gKpuIRk7etsSSNiuXLINMk6ZLwmEcp1eSM Ks/QNLKDxG2kfAKh5qjGPSCzR5sZMqPWZ9gg5r6NdVAFHG7V18DSbsKIFJgJJeCodAwo bQWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Hw5dNkVJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 61-v6si181837qtf.322.2018.06.22.07.38.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Jun 2018 07:38:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Hw5dNkVJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWND6-00038B-GX for patch@linaro.org; Fri, 22 Jun 2018 10:38:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWMnQ-00068q-R9 for qemu-devel@nongnu.org; Fri, 22 Jun 2018 10:12:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWMnP-0006Aj-Or for qemu-devel@nongnu.org; Fri, 22 Jun 2018 10:12:16 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:40645) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fWMnP-00069y-II for qemu-devel@nongnu.org; Fri, 22 Jun 2018 10:12:15 -0400 Received: by mail-wm0-x234.google.com with SMTP id n5-v6so2762645wmc.5 for ; Fri, 22 Jun 2018 07:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yGIXH0KQMm00dKEL2Etwd2IPZwUNEDVV+bNKLpa67ZE=; b=Hw5dNkVJcb9x4MEe6jZD44983PPUYYLhZwe0glMCXB+fAyF36IrhhXt7AvB6aq3mIP olhf2UAon5KRqL1nrEioJpHD4cqJNaWSbwCh3eI1ShjSA/3dQCR+bCcpOkVzM29y2Iqr 9hiTYFubtXQNuWHzruFQji4vAea6VpsBospXQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yGIXH0KQMm00dKEL2Etwd2IPZwUNEDVV+bNKLpa67ZE=; b=DQsIWDnlyfQbS2kFscDwTVUEeLGH3t8X3yLk9TDiix/+kVK49Mw5+mx11KmVqQzy/R SrflUzbfXyrVtjbyYohHH8Lej8rPJLxkWwb/PNA+ww6lNW1J3pnODRNgUj/RQrIanx9/ 5WiSXvJa/AHLsmxvqXuczOifHA2iQIhE32bqNwNXhbZcJYUr1gqI1i0BDI1tBAIN3Wn5 zEYzYucnZieAPKZdl1/dlYuPSr2a04v1HYEgH6Op5qJN+nnM0caMdU4JB7HXiGpB3M7q KOOVfkkdhAx6f1hGdP6mr2fm0XKrYTj8E/txDQNOVy9uHQJmZAElu5SS+mz7ajAuBPvU Oo+A== X-Gm-Message-State: APt69E2vzvUvhMmvr2hw9SxN7E+ZzFFO4f6fakqS8Tv5xmqKs9wezpw0 rXqE+cyCk5S/EFnRdnD2mZnY5A== X-Received: by 2002:a1c:1389:: with SMTP id 131-v6mr1870952wmt.65.1529676734503; Fri, 22 Jun 2018 07:12:14 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h8-v6sm1284797wmb.32.2018.06.22.07.12.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jun 2018 07:12:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BFFC03E0AC0; Fri, 22 Jun 2018 15:12:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 22 Jun 2018 15:11:52 +0100 Message-Id: <20180622141205.16306-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180622141205.16306-1-alex.bennee@linaro.org> References: <20180622141205.16306-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::234 Subject: [Qemu-devel] [RISU PATCH v4 09/22] risugen: use fewer insns for aarch64 immediate load X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, richard.henderson@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Alex Bennée --- risugen_arm.pm | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) -- 2.17.1 Signed-off-by: Richard Henderson diff --git a/risugen_arm.pm b/risugen_arm.pm index 83e521d..485e94e 100644 --- a/risugen_arm.pm +++ b/risugen_arm.pm @@ -261,15 +261,13 @@ sub write_mov_rr($$) sub write_mov_ri16($$$) { - # Write 16 bits of immediate to register, using either MOVW or MOVT + # Write 16 bits of immediate to register. my ($rd, $imm, $is_movt) = @_; - die "write_mov_ri16: immediate $imm out of range\n" if (($imm & 0xffff0000) != 0); - if ($is_aarch64) { - # Use MOVZ 0x52800000. is_movt means MOVK of high bits */ - insn32(0xd2800000 | ($is_movt << 29) | ($is_movt ? 16 << 17 : 0) | ($imm << 5) | $rd); + die "write_mov_ri16: invalid operation for this arch.\n" if ($is_aarch64); + die "write_mov_ri16: immediate $imm out of range\n" if (($imm & 0xffff0000) != 0); - } elsif ($is_thumb) { + if ($is_thumb) { # enc T3 my ($imm4, $i, $imm3, $imm8) = (($imm & 0xf000) >> 12, ($imm & 0x0800) >> 11, @@ -287,16 +285,24 @@ sub write_mov_ri16($$$) sub write_mov_ri($$) { - # We always use a MOVW/MOVT pair, for simplicity. - # on aarch64, we use a MOVZ/MOVK pair. my ($rd, $imm) = @_; - write_mov_ri16($rd, ($imm & 0xffff), 0); my $highhalf = ($imm >> 16) & 0xffff; - write_mov_ri16($rd, $highhalf, 1) if $highhalf; - if ($is_aarch64 && $imm < 0) { - # sign extend to allow small negative imm constants - write_sxt32($rd, $rd); + if ($is_aarch64) { + if ($imm < 0) { + # MOVN + insn32(0x92800000 | ((~$imm & 0xffff) << 5) | $rd); + # MOVK, LSL 16 + insn32(0xf2a00000 | ($highhalf << 5) | $rd) if $highhalf != 0xffff; + } else { + # MOVZ + insn32(0x52800000 | (($imm & 0xffff) << 5) | $rd); + # MOVK, LSL 16 + insn32(0xf2a00000 | ($highhalf << 5) | $rd) if $highhalf != 0; + } + } else { + write_mov_ri16($rd, ($imm & 0xffff), 0); + write_mov_ri16($rd, $highhalf, 1) if $highhalf; } }