From patchwork Wed Jan 20 03:29:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Simpson X-Patchwork-Id: 12031345 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31368C433E0 for ; Wed, 20 Jan 2021 03:37:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A14EA22509 for ; Wed, 20 Jan 2021 03:37:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A14EA22509 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=quicinc.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l24JX-0000FW-H3 for qemu-devel@archiver.kernel.org; Tue, 19 Jan 2021 22:37:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l24Bl-0007QB-Fv for qemu-devel@nongnu.org; Tue, 19 Jan 2021 22:29:45 -0500 Received: from alexa-out-sd-02.qualcomm.com ([199.106.114.39]:53873) by eggs.gnu.org with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l24Bh-0007VW-Bz for qemu-devel@nongnu.org; Tue, 19 Jan 2021 22:29:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1611113381; x=1642649381; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o45F1AwVRzexZ6A06uTz8OYOoUKa6MHWvtECMn9REfk=; b=lRfcHpAnYx1Zk0SK/YL61aICFKZAuBQLfmMUmiRLPo8k8FvWMVdQfz14 oMgj0KjuX5EsPIiMT8kynrV7tvukgu7yuwzRnUkUXNu12bHsZNzjJQC1x ah3Jz/1ki+qKpLJgBJyMO28OQ8WdNF6wJirVCFZ3/DqkPyKSUUMZwkSXT A=; Received: from unknown (HELO ironmsg02-sd.qualcomm.com) ([10.53.140.142]) by alexa-out-sd-02.qualcomm.com with ESMTP; 19 Jan 2021 19:29:29 -0800 X-QCInternal: smtphost Received: from vu-tsimpson-aus.qualcomm.com (HELO vu-tsimpson1-aus.qualcomm.com) ([10.222.150.1]) by ironmsg02-sd.qualcomm.com with ESMTP; 19 Jan 2021 19:29:28 -0800 Received: by vu-tsimpson1-aus.qualcomm.com (Postfix, from userid 47164) id 81037295E; Tue, 19 Jan 2021 21:29:28 -0600 (CST) From: Taylor Simpson To: qemu-devel@nongnu.org Subject: [PATCH v7 34/35] Hexagon build infrastructure Date: Tue, 19 Jan 2021 21:29:07 -0600 Message-Id: <1611113349-24906-35-git-send-email-tsimpson@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1611113349-24906-1-git-send-email-tsimpson@quicinc.com> References: <1611113349-24906-1-git-send-email-tsimpson@quicinc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=199.106.114.39; envelope-from=tsimpson@qualcomm.com; helo=alexa-out-sd-02.qualcomm.com X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ale@rev.ng, bcain@quicinc.com, philmd@redhat.com, richard.henderson@linaro.org, laurent@vivier.eu, tsimpson@quicinc.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add file to default-configs Add hexagon to meson.build Add hexagon to target/meson.build Add target/hexagon/meson.build Change scripts/qemu-binfmt-conf.sh We can build a hexagon-linux-user target and run programs on the Hexagon scalar core. With hexagon-linux-clang installed, "make check-tcg" will pass. Signed-off-by: Taylor Simpson --- default-configs/targets/hexagon-linux-user.mak | 1 + meson.build | 1 + scripts/qemu-binfmt-conf.sh | 6 +- target/hexagon/meson.build | 187 +++++++++++++++++++++++++ target/meson.build | 1 + 5 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 default-configs/targets/hexagon-linux-user.mak create mode 100644 target/hexagon/meson.build diff --git a/default-configs/targets/hexagon-linux-user.mak b/default-configs/targets/hexagon-linux-user.mak new file mode 100644 index 0000000..003ed0a --- /dev/null +++ b/default-configs/targets/hexagon-linux-user.mak @@ -0,0 +1 @@ +TARGET_ARCH=hexagon diff --git a/meson.build b/meson.build index 3d88985..1cc6823 100644 --- a/meson.build +++ b/meson.build @@ -1156,6 +1156,7 @@ disassemblers = { 'arm' : ['CONFIG_ARM_DIS'], 'avr' : ['CONFIG_AVR_DIS'], 'cris' : ['CONFIG_CRIS_DIS'], + 'hexagon' : ['CONFIG_HEXAGON_DIS'], 'hppa' : ['CONFIG_HPPA_DIS'], 'i386' : ['CONFIG_I386_DIS'], 'x86_64' : ['CONFIG_I386_DIS'], diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 9f1580a..7b5d54b 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -4,7 +4,7 @@ qemu_target_list="i386 i486 alpha arm armeb sparc sparc32plus sparc64 \ ppc ppc64 ppc64le m68k mips mipsel mipsn32 mipsn32el mips64 mips64el \ sh4 sh4eb s390x aarch64 aarch64_be hppa riscv32 riscv64 xtensa xtensaeb \ -microblaze microblazeel or1k x86_64" +microblaze microblazeel or1k x86_64 hexagon" i386_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00' i386_mask='\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff' @@ -136,6 +136,10 @@ or1k_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\ or1k_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff' or1k_family=or1k +hexagon_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xa4\x00' +hexagon_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff' +hexagon_family=hexagon + qemu_get_family() { cpu=${HOST_ARCH:-$(uname -m)} case "$cpu" in diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build new file mode 100644 index 0000000..48adab5 --- /dev/null +++ b/target/hexagon/meson.build @@ -0,0 +1,187 @@ +## +## Copyright(c) 2020-2021 Qualcomm Innovation Center, Inc. All Rights Reserved. +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, see . +## + +hexagon_ss = ss.source_set() + +prog_python = import('python').find_installation('python3') + +hex_common_py = 'hex_common.py' +attribs_def_h = meson.current_source_dir() / 'attribs_def.h' +gen_tcg_h = meson.current_source_dir() / 'gen_tcg.h' + +# +# Step 1 +# We use a C program to create semantics_generated.pyinc +# +gen_semantics = executable('gen_semantics', 'gen_semantics.c') + +semantics = custom_target( + 'semantics_generated.pyinc', + output: 'semantics_generated.pyinc', + input: gen_semantics, + command: ['@INPUT@', '@OUTPUT@'], +) +hexagon_ss.add(semantics) + +# +# Step 2 +# We use Python scripts to generate the following files +# shortcode_generated.h +# helper_protos_generated.h +# tcg_funcs_generated.h +# tcg_func_table_generated.h +# helper_funcs_generated.h +# printinsn_generated.h +# op_regs_generated.h +# op_attribs_generated.h +# opcodes_def_generated.h +# +shortcode_h = custom_target( + 'shortcode_generated.h', + output: 'shortcode_generated.h', + input: 'gen_shortcode.py', + depends: [semantics], + depend_files: [hex_common_py, attribs_def_h], + command: [prog_python, '@INPUT@', semantics, attribs_def_h, '@OUTPUT@'], +) +hexagon_ss.add(shortcode_h) + +helper_protos_h = custom_target( + 'helper_protos_generated.h', + output: 'helper_protos_generated.h', + input: 'gen_helper_protos.py', + depends: [semantics], + depend_files: [hex_common_py, attribs_def_h, gen_tcg_h], + command: [prog_python, '@INPUT@', semantics, attribs_def_h, gen_tcg_h, '@OUTPUT@'], +) +hexagon_ss.add(helper_protos_h) + +tcg_funcs_h = custom_target( + 'tcg_funcs_generated.h', + output: 'tcg_funcs_generated.h', + input: 'gen_tcg_funcs.py', + depends: [semantics], + depend_files: [hex_common_py, attribs_def_h, gen_tcg_h], + command: [prog_python, '@INPUT@', semantics, attribs_def_h, gen_tcg_h, '@OUTPUT@'], +) +hexagon_ss.add(tcg_funcs_h) + +tcg_func_table_h = custom_target( + 'tcg_func_table_generated.h', + output: 'tcg_func_table_generated.h', + input: 'gen_tcg_func_table.py', + depends: [semantics], + depend_files: [hex_common_py, attribs_def_h], + command: [prog_python, '@INPUT@', semantics, attribs_def_h, '@OUTPUT@'], +) +hexagon_ss.add(tcg_func_table_h) + +helper_funcs_h = custom_target( + 'helper_funcs_generated.h', + output: 'helper_funcs_generated.h', + input: 'gen_helper_funcs.py', + depends: [semantics], + depend_files: [hex_common_py, attribs_def_h, gen_tcg_h], + command: [prog_python, '@INPUT@', semantics, attribs_def_h, gen_tcg_h, '@OUTPUT@'], +) +hexagon_ss.add(helper_funcs_h) + +printinsn_h = custom_target( + 'printinsn_generated.h', + output: 'printinsn_generated.h', + input: 'gen_printinsn.py', + depends: [semantics], + depend_files: [hex_common_py, attribs_def_h], + command: [prog_python, '@INPUT@', semantics, attribs_def_h, '@OUTPUT@'], +) +hexagon_ss.add(printinsn_h) + +op_regs_h = custom_target( + 'op_regs_generated.h', + output: 'op_regs_generated.h', + input: 'gen_op_regs.py', + depends: [semantics], + depend_files: [hex_common_py, attribs_def_h], + command: [prog_python, '@INPUT@', semantics, attribs_def_h, '@OUTPUT@'], +) +hexagon_ss.add(op_regs_h) + +op_attribs_h = custom_target( + 'op_attribs_generated.h', + output: 'op_attribs_generated.h', + input: 'gen_op_attribs.py', + depends: [semantics], + depend_files: [hex_common_py, attribs_def_h], + command: [prog_python, '@INPUT@', semantics, attribs_def_h, '@OUTPUT@'], +) +hexagon_ss.add(op_attribs_h) + +opcodes_def_h = custom_target( + 'opcodes_def_generated.h', + output: 'opcodes_def_generated.h', + input: 'gen_opcodes_def.py', + depends: [semantics], + depend_files: [hex_common_py, attribs_def_h], + command: [prog_python, '@INPUT@', semantics, attribs_def_h, '@OUTPUT@'], +) +hexagon_ss.add(opcodes_def_h) + +# +# Step 3 +# We use a C program to create iset.py which is imported into dectree.py +# to create the decode tree +# +gen_dectree_import = executable('gen_dectree_import', 'gen_dectree_import.c', opcodes_def_h, op_regs_h) + +iset_py = custom_target( + 'iset.py', + output: 'iset.py', + input: gen_dectree_import, + command: ['@INPUT@', '@OUTPUT@'], +) +hexagon_ss.add(iset_py) + +# +# Step 4 +# We use the dectree.py script to generate the decode tree header file +# +dectree_h = custom_target( + 'dectree_generated.h', + output: 'dectree_generated.h', + input: 'dectree.py', + depends: [iset_py], + command: ['PYTHONPATH=' + meson.current_build_dir(), '@INPUT@', '@OUTPUT@'], +) +hexagon_ss.add(dectree_h) + +hexagon_ss.add(files( + 'cpu.c', + 'translate.c', + 'op_helper.c', + 'gdbstub.c', + 'genptr.c', + 'reg_fields.c', + 'decode.c', + 'iclass.c', + 'opcodes.c', + 'printinsn.c', + 'arch.c', + 'fma_emu.c', + 'conv_emu.c', +)) + +target_arch += {'hexagon': hexagon_ss} diff --git a/target/meson.build b/target/meson.build index 9f0ae93..c35c1e9 100644 --- a/target/meson.build +++ b/target/meson.build @@ -2,6 +2,7 @@ subdir('alpha') subdir('arm') subdir('avr') subdir('cris') +subdir('hexagon') subdir('hppa') subdir('i386') subdir('lm32')