From patchwork Sun Apr 18 22:50:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1467697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=hFblm6no; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FNlZH0xVRz9vFP for ; Mon, 19 Apr 2021 08:52:05 +1000 (AEST) Received: from localhost ([::1]:53880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYGGo-0002Lb-Nc for incoming@patchwork.ozlabs.org; Sun, 18 Apr 2021 18:52:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYGFu-0002LO-DW for qemu-devel@nongnu.org; Sun, 18 Apr 2021 18:51:10 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:35365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYGFq-0000Ia-E9 for qemu-devel@nongnu.org; Sun, 18 Apr 2021 18:51:05 -0400 Received: by mail-wm1-x32c.google.com with SMTP id w7-20020a1cdf070000b0290125f388fb34so16992574wmg.0 for ; Sun, 18 Apr 2021 15:51:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PIT/AG48S0oYaeGZXPQlYaIdWb8RsGZJAgWMJu1K6MM=; b=hFblm6nohi6+fQrbMaYM9harvWx0mql8lal7hcBosnwxWlf8BxbI3y3xwZT+jp5zUs LgHuU3DgMUsVpTXyp+HGqcQ8AtU8TpZCTc+3Ucj8rYnYnk8+FmfyEhqTlOMguqW/8WK9 oYN2mqrquQjvKSakr7efy/aFF918MMAncK2yXUlGUh5tmwqYR2sXM59TSiPKcPaH6o3N rSdoXQi0fLB1pY30muFYOjjy3+4YI1asmmerW4zCDzJ5UhRQodmMzq6m22gcti4E7Z2d UZ1fp1yOQ+Shz2bME0mcE8lEDr4phhzylkIU+DFrO/eYlDrbk03J9xX0BHD2CShKkgAP 6DOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=PIT/AG48S0oYaeGZXPQlYaIdWb8RsGZJAgWMJu1K6MM=; b=SFqYPVoRo1lLX5SAs8/zXbRpRGZTjewFgI92lmRlNb1TYwrqPhgklp5zxAIxtb+V+P vodWV+2AM9tspR6x5XPBiDzMiXp+9Idp7jDismZ+biZZJb48pkjC35ByAlZ6Tz+NweUu nt1GIGVxOQ6vS7RQDcmCNCXIgQ7YtPtwBOki3M8fpv4ge7OAbnJHvveiQsFRhoS0U/yw 6kYCM/Q2hqRG2kPZzpywD9/vf9N3+rhGLbOASrnEWLdLSig0FlKXNLaDwr2M7v13Kj4O JCFhnYugG7qB6yGv2jZGuYyR4ZV19dscBAWANXYHQPvzlHmQH3qrTrv30EG7nM2xfVIp J43A== X-Gm-Message-State: AOAM532cyT1rpuXNY01IIZ4sxgjz3dn/VTAaJ3y4RmBz5KmkNwb2Jlrq puQVdOZ8/0UPT3hCXNaHKNcpc4tw3ug/BQ== X-Google-Smtp-Source: ABdhPJw55J4UlcEDVARwIz8w6aN1z7kwYgOR/YjtF8ma/WnQDZCOwQj3KVhk9NpFwgHw7W5J1cEmjw== X-Received: by 2002:a1c:7d92:: with SMTP id y140mr18547601wmc.41.1618786260336; Sun, 18 Apr 2021 15:51:00 -0700 (PDT) Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id v3sm17748762wmj.25.2021.04.18.15.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 15:50:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 00/29] target/mips: Re-org to allow KVM-only builds Date: Mon, 19 Apr 2021 00:50:29 +0200 Message-Id: <20210418225058.1257014-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Aleksandar Rikalo , Huacai Chen , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" TL;DR: This series restrict TCG-specific objects by moving them to the tcg/ subdir. Code is moved around to satisfy 3 cases: { generic sysemu / tcg sysemu / tcg user}. Since v1: - Addressed Richard review comments - Added Richard R-b tag Missing review: 5, 7, 8, 17, 18, 23 Hi, This series move the MIPS TCG files under target/mips/tcg/. tcg/ is split into {sysemu and user}, and code common to both user/sysemu is left under tcg/ root. Non-user code is moved to sysemu/ (common to TCG and KVM). - Patches 1 & 10 are Meson generic - Patches 2 to 9 move generic symbols around to satisfly KVM linking - Patch 11 introduces tcg-internal.h where we'll move TCG specific prototypes from the current big internal.h - Patches 12-27 move code by topic (first user, then sysemu, then tcg) - Patch 28 restrict TCG specific machines to TCG (to actually only build malta/loongson3-virt machines when restricted to KVM) - Patch 29 finally add a CI job with "KVM-only" config: https://gitlab.com/philmd/qemu/-/jobs/1189874868 (12min 5sec) Diffstat is not that bad, and many #ifdef'ry removed. Please review, Phil. Based-on: <20210413081008.3409459-1-f4bug@amsat.org> "exec: Remove accel/tcg/ from include paths" Philippe Mathieu-Daudé (29): target/mips: Simplify meson TCG rules target/mips: Move IEEE rounding mode array to new source file target/mips: Move msa_reset() to new source file target/mips: Make CPU/FPU regnames[] arrays global target/mips: Optimize CPU/FPU regnames[] arrays target/mips: Restrict mips_cpu_dump_state() to cpu.c target/mips: Turn printfpr() macro into a proper function target/mips: Declare mips_cpu_set_error_pc() inlined in "internal.h" target/mips: Extract load/store helpers to ldst_helper.c meson: Introduce meson_user_arch source set for arch-specific user-mode target/mips: Introduce tcg-internal.h for TCG specific declarations target/mips: Add simple user-mode mips_cpu_do_interrupt() target/mips: Add simple user-mode mips_cpu_tlb_fill() target/mips: Move cpu_signal_handler definition around target/mips: Move sysemu specific files under sysemu/ subfolder target/mips: Move physical addressing code to sysemu/physaddr.c target/mips: Restrict cpu_mips_get_random() / update_pagemask() to TCG target/mips: Move sysemu TCG-specific code to tcg/sysemu/ subfolder target/mips: Restrict mmu_init() to TCG target/mips: Move tlb_helper.c to tcg/sysemu/ target/mips: Restrict CPUMIPSTLBContext::map_address() handlers scope target/mips: Move Special opcodes to tcg/sysemu/special_helper.c target/mips: Move helper_cache() to tcg/sysemu/special_helper.c target/mips: Move TLB management helpers to tcg/sysemu/tlb_helper.c target/mips: Move exception management code to exception.c target/mips: Move CP0 helpers to sysemu/cp0.c target/mips: Move TCG source files under tcg/ sub directory hw/mips: Restrict non-virtualized machines to TCG gitlab-ci: Add KVM mips64el cross-build jobs meson.build | 6 + target/mips/helper.h | 183 +-- target/mips/internal.h | 106 +- target/mips/tcg/tcg-internal.h | 64 + target/mips/{ => tcg}/msa_helper.h.inc | 0 target/mips/tcg/sysemu_helper.h.inc | 185 +++ target/mips/{ => tcg}/mips32r6.decode | 0 target/mips/{ => tcg}/mips64r6.decode | 0 target/mips/{ => tcg}/msa32.decode | 0 target/mips/{ => tcg}/msa64.decode | 0 target/mips/{ => tcg}/tx79.decode | 0 target/mips/cpu.c | 311 ++--- target/mips/fpu.c | 25 + target/mips/msa.c | 60 + target/mips/op_helper.c | 1210 ------------------ target/mips/{ => sysemu}/addr.c | 0 target/mips/sysemu/cp0.c | 123 ++ target/mips/{ => sysemu}/cp0_timer.c | 0 target/mips/{ => sysemu}/machine.c | 0 target/mips/sysemu/physaddr.c | 257 ++++ target/mips/{ => tcg}/dsp_helper.c | 0 target/mips/tcg/exception.c | 169 +++ target/mips/{ => tcg}/fpu_helper.c | 8 - target/mips/tcg/ldst_helper.c | 304 +++++ target/mips/{ => tcg}/lmmi_helper.c | 0 target/mips/{ => tcg}/msa_helper.c | 36 - target/mips/{ => tcg}/msa_translate.c | 0 target/mips/{ => tcg}/mxu_translate.c | 0 target/mips/tcg/op_helper.c | 421 ++++++ target/mips/{ => tcg}/rel6_translate.c | 0 target/mips/{ => tcg/sysemu}/cp0_helper.c | 0 target/mips/{ => tcg/sysemu}/mips-semi.c | 0 target/mips/tcg/sysemu/special_helper.c | 173 +++ target/mips/{ => tcg/sysemu}/tlb_helper.c | 612 +++++---- target/mips/{ => tcg}/translate.c | 104 +- target/mips/{ => tcg}/translate_addr_const.c | 0 target/mips/{ => tcg}/tx79_translate.c | 0 target/mips/{ => tcg}/txx9_translate.c | 0 target/mips/tcg/user/tlb_helper.c | 64 + .gitlab-ci.d/crossbuilds.yml | 8 + MAINTAINERS | 3 +- hw/mips/meson.build | 11 +- target/mips/meson.build | 55 +- target/mips/sysemu/meson.build | 7 + target/mips/tcg/meson.build | 35 + target/mips/tcg/sysemu/meson.build | 6 + target/mips/tcg/user/meson.build | 3 + 47 files changed, 2407 insertions(+), 2142 deletions(-) create mode 100644 target/mips/tcg/tcg-internal.h rename target/mips/{ => tcg}/msa_helper.h.inc (100%) create mode 100644 target/mips/tcg/sysemu_helper.h.inc rename target/mips/{ => tcg}/mips32r6.decode (100%) rename target/mips/{ => tcg}/mips64r6.decode (100%) rename target/mips/{ => tcg}/msa32.decode (100%) rename target/mips/{ => tcg}/msa64.decode (100%) rename target/mips/{ => tcg}/tx79.decode (100%) create mode 100644 target/mips/fpu.c create mode 100644 target/mips/msa.c delete mode 100644 target/mips/op_helper.c rename target/mips/{ => sysemu}/addr.c (100%) create mode 100644 target/mips/sysemu/cp0.c rename target/mips/{ => sysemu}/cp0_timer.c (100%) rename target/mips/{ => sysemu}/machine.c (100%) create mode 100644 target/mips/sysemu/physaddr.c rename target/mips/{ => tcg}/dsp_helper.c (100%) create mode 100644 target/mips/tcg/exception.c rename target/mips/{ => tcg}/fpu_helper.c (99%) create mode 100644 target/mips/tcg/ldst_helper.c rename target/mips/{ => tcg}/lmmi_helper.c (100%) rename target/mips/{ => tcg}/msa_helper.c (99%) rename target/mips/{ => tcg}/msa_translate.c (100%) rename target/mips/{ => tcg}/mxu_translate.c (100%) create mode 100644 target/mips/tcg/op_helper.c rename target/mips/{ => tcg}/rel6_translate.c (100%) rename target/mips/{ => tcg/sysemu}/cp0_helper.c (100%) rename target/mips/{ => tcg/sysemu}/mips-semi.c (100%) create mode 100644 target/mips/tcg/sysemu/special_helper.c rename target/mips/{ => tcg/sysemu}/tlb_helper.c (76%) rename target/mips/{ => tcg}/translate.c (99%) rename target/mips/{ => tcg}/translate_addr_const.c (100%) rename target/mips/{ => tcg}/tx79_translate.c (100%) rename target/mips/{ => tcg}/txx9_translate.c (100%) create mode 100644 target/mips/tcg/user/tlb_helper.c create mode 100644 target/mips/sysemu/meson.build create mode 100644 target/mips/tcg/meson.build create mode 100644 target/mips/tcg/sysemu/meson.build create mode 100644 target/mips/tcg/user/meson.build