From patchwork Fri Sep 8 12:45:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Wiederhake X-Patchwork-Id: 1831530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gY4WHALt; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RhwqH2bXwz1yh5 for ; Fri, 8 Sep 2023 22:47:07 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeasK-0003oY-2t; Fri, 08 Sep 2023 08:46:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeasC-0003iO-Nw for qemu-devel@nongnu.org; Fri, 08 Sep 2023 08:46:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeas6-0006Lq-Tz for qemu-devel@nongnu.org; Fri, 08 Sep 2023 08:46:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694177150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tMHaGTzPO5hAxGJz4y5qWrfcim7WggOPevcuEvAy/mU=; b=gY4WHALtUYuibZl2EEcyTEimgmcNR3VW+PlzOPx6R5IhwTfpsH2w1MU/qCSspdwnSsKkuf 1Ti9XVx8F9/L+nya1nbUqWju8cp5C+IMh8kvajD2PlH85fVyTfW3VBtoVikZyzuZAsjpOn slTXcxBhKTzLuIdrtQOT1E3uyqISzWU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-KEavpg4IMrCXJ_GMCXiUtw-1; Fri, 08 Sep 2023 08:45:48 -0400 X-MC-Unique: KEavpg4IMrCXJ_GMCXiUtw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDF50917EBA; Fri, 8 Sep 2023 12:45:47 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.194.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 11DD6200BFEA; Fri, 8 Sep 2023 12:45:46 +0000 (UTC) From: Tim Wiederhake To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P_=2E_Berrang=C3=A9?= , Paolo Bonzini , "Michael S . Tsirkin" , Tim Wiederhake Subject: [PATCH v2 10/10] target/i386: Autogenerate feature_word_info.c.inc Date: Fri, 8 Sep 2023 14:45:34 +0200 Message-Id: <20230908124534.25027-11-twiederh@redhat.com> In-Reply-To: <20230908124534.25027-1-twiederh@redhat.com> References: <20230908124534.25027-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=twiederh@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.29 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 This introduces no semantic changes to the file. Signed-off-by: Tim Wiederhake --- target/i386/feature_word_info.c.inc | 2 + target/i386/feature_word_info.py | 62 +++++++++++++++++++++++++++++ target/i386/feature_word_info.yaml | 2 + 3 files changed, 66 insertions(+) create mode 100755 target/i386/feature_word_info.py diff --git a/target/i386/feature_word_info.c.inc b/target/i386/feature_word_info.c.inc index 5bac4aaeba..fb699528a6 100644 --- a/target/i386/feature_word_info.c.inc +++ b/target/i386/feature_word_info.c.inc @@ -1,3 +1,5 @@ +/* This file is generated by feature_word_info.py. */ + FeatureWordInfo feature_word_info[FEATURE_WORDS] = { [FEAT_1_EDX] = { .type = CPUID_FEATURE_WORD, diff --git a/target/i386/feature_word_info.py b/target/i386/feature_word_info.py new file mode 100755 index 0000000000..e5773c8dbf --- /dev/null +++ b/target/i386/feature_word_info.py @@ -0,0 +1,62 @@ +#!/bin/env python3 + +import os +import yaml + + +def write_feature_word(f, data): + f.write(" [{}] = {{\n".format(data["index"])) + f.write(" .type = {},\n".format(data["type"])) + f.write(" .feat_names = {\n") + for index in range(64): + name = data.get("feat_names", {}).get(index) + name = "NULL" if name is None else "\"" + name + "\"" + if index % 4 == 0: + f.write(" " * 11) + f.write(" " + str(name) + ",") + if index % 4 == 3: + f.write("\n") + f.write(" },\n") + if "cpuid" in data: + cpuid = data["cpuid"] + f.write(" .cpuid = {\n") + f.write(" .eax = {},\n".format(cpuid["eax"])) + if "ecx" in cpuid: + f.write(" .needs_ecx = true,\n") + f.write(" .ecx = {},\n".format(cpuid["ecx"])) + f.write(" .reg = {},\n".format(cpuid["reg"])) + f.write(" },\n") + if "msr" in data: + f.write(" .msr = {\n") + f.write(" .index = {},\n".format(data["msr"])) + f.write(" },\n") + if "tcg_features" in data: + f.write(" .tcg_features = {},\n".format(data["tcg_features"])) + if "unmigratable_flags" in data: + f.write(" .unmigratable_flags = {},\n".format( + data["unmigratable_flags"])) + if "migratable_flags" in data: + f.write(" .migratable_flags = {},\n".format( + data["migratable_flags"])) + if "no_autoenable_flags" in data: + f.write(" .no_autoenable_flags = {},\n".format( + data["no_autoenable_flags"])) + f.write(" },\n") + + +def main(): + dirname = os.path.dirname(__file__) + + with open(os.path.join(dirname, "feature_word_info.yaml"), "tr") as f: + feature_words = yaml.safe_load(f) + + with open(os.path.join(dirname, "feature_word_info.c.inc"), "tw") as f: + f.write("/* This file is generated by feature_word_info.py. */\n\n") + f.write("FeatureWordInfo feature_word_info[FEATURE_WORDS] = {\n") + for feature_word in feature_words: + write_feature_word(f, feature_word) + f.write("};\n") + + +if __name__ == "__main__": + main() diff --git a/target/i386/feature_word_info.yaml b/target/i386/feature_word_info.yaml index cd6cdc8053..79914a0ece 100644 --- a/target/i386/feature_word_info.yaml +++ b/target/i386/feature_word_info.yaml @@ -1,3 +1,5 @@ +# Run `feature_word_info.py` when you make changes to this file. + - index: FEAT_1_EDX cpuid: eax: '1'