From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2B3F3C71153 for ; Sun, 10 Sep 2023 23:41:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfU2h-0004Sk-Ek; Sun, 10 Sep 2023 19:40:39 -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 1qfU2g-0004SK-1q for qemu-devel@nongnu.org; Sun, 10 Sep 2023 19:40:38 -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 1qfU2d-0007am-EH for qemu-devel@nongnu.org; Sun, 10 Sep 2023 19:40:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694389234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7gFrfst67vcV3eEFf0unDwCn+89yqJz8XENfDXeUu5o=; b=CaBlOINOnDqTvEsEYb1aICzuXKNKz4GNTxf5dsgUkbVIlO0YypkEouF9ApZSVCMDYFZUTz dO1qze3s0E3ODTOjxFCA1lC1mXIO5t/vVOKBh0EqAc887TsIrPg6bKJ2KEeIOxbp6zGDlg 4/MA8BTrqBkDyGLp1tIQuk00ScrhmhU= Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-687-O48IoKauP1WJpTAeybjyRQ-1; Sun, 10 Sep 2023 19:40:33 -0400 X-MC-Unique: O48IoKauP1WJpTAeybjyRQ-1 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-68fbd31d9a1so647835b3a.1 for ; Sun, 10 Sep 2023 16:40:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694389232; x=1694994032; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7gFrfst67vcV3eEFf0unDwCn+89yqJz8XENfDXeUu5o=; b=G5YCuLxhWyxRcQGqG9djzxbsS2FbpLCexpubY1TqdpzJvKegItldzTA513pvSAvivE J6XEiNZuQGH70DCyqcw4ME5OOr4gzBsMo+p5xct49A3IIvU+ZZ6R4AttEVYtXwH4xNli C8bvUeHPTJKslnimbrGxbr2rQVgj60V6Sl+c8jd252+q9WDArjJKcBLHDXnF9Wvt22xa PrE6IuB4+PENcpljitHsLmsoGhZWLL3ZwgIHq0dc9NBe17P6QYM+O/Lb6amtI6RAyybQ DVV2YkG6HdpcQHp/MBEdEOSBYOy6dIdgg9+okAz6NYeaqIfqIjX2Bm6k13c0ZhLuqedR FLoA== X-Gm-Message-State: AOJu0YwjSrFkdMxNoxqdkSPOdPBSRujt3H28wtKwvrWJP75CkwjN0/+G r+VucLyi3FmGXhJwNfUrxjIOjnMzEO+xSKyhSPPnvL1T6u/jSX9jFlU4mMvcLuLCBUk+EQl0DzA 18iT/mGJrVb7/0xY= X-Received: by 2002:a05:6a00:1389:b0:68b:daf2:b2d2 with SMTP id t9-20020a056a00138900b0068bdaf2b2d2mr11630996pfg.1.1694389232069; Sun, 10 Sep 2023 16:40:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHenutwgJuwzNzTqjt0v5oGIQiZHsGkR02yQFDhtASxMBWNCv9o4gLf3fUYdFoTn/13Gy7DbA== X-Received: by 2002:a05:6a00:1389:b0:68b:daf2:b2d2 with SMTP id t9-20020a056a00138900b0068bdaf2b2d2mr11630977pfg.1.1694389231682; Sun, 10 Sep 2023 16:40:31 -0700 (PDT) Received: from ?IPV6:2001:8003:e5b0:9f00:dbbc:1945:6e65:ec5? ([2001:8003:e5b0:9f00:dbbc:1945:6e65:ec5]) by smtp.gmail.com with ESMTPSA id ei10-20020a056a0080ca00b006871fdde2c7sm961856pfb.110.2023.09.10.16.40.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 10 Sep 2023 16:40:31 -0700 (PDT) Message-ID: <78b44397-dcc4-c795-a5f2-c5fd7003e267@redhat.com> Date: Mon, 11 Sep 2023 09:40:16 +1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH 4/4] hw/cpu: Call object_class_dynamic_cast() once in cpu_class_by_name() Content-Language: en-US To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org, David Hildenbrand Cc: Chris Wulff , David Gibson , qemu-s390x@nongnu.org, Weiwei Li , qemu-arm@nongnu.org, Mark Cave-Ayland , Jiaxun Yang , Yoshinori Sato , Richard Henderson , Marcel Apfelbaum , Max Filippov , Nicholas Piggin , Eduardo Habkost , Ilya Leoshkevich , Bastian Koppelmann , Greg Kurz , "Edgar E. Iglesias" , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Marek Vasut , Palmer Dabbelt , Michael Rolnik , Laurent Vivier , Peter Maydell , qemu-riscv@nongnu.org, Aurelien Jarno , Bin Meng , Xiaojuan Yang , Daniel Henrique Barboza , Aleksandar Rikalo , Artyom Tarasenko , Song Gao , Stafford Horne , Yanan Wang , Alistair Francis , Brian Cain , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Thomas Huth , Liu Zhiwei References: <20230908112235.75914-1-philmd@linaro.org> <20230908112235.75914-5-philmd@linaro.org> From: Gavin Shan In-Reply-To: <20230908112235.75914-5-philmd@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=gshan@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 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, NICE_REPLY_A=-1.473, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 9/8/23 21:22, Philippe Mathieu-Daudé wrote: > Leverage the public CPUClass::cpu_resolving_type field and > call object_class_dynamic_cast() once in cpu_class_by_name(). > > Signed-off-by: Philippe Mathieu-Daudé > --- > hw/core/cpu-common.c | 3 ++- > target/alpha/cpu.c | 3 +-- > target/arm/cpu.c | 4 +--- > target/avr/cpu.c | 4 +--- > target/cris/cpu.c | 4 +--- > target/hexagon/cpu.c | 4 +--- > target/loongarch/cpu.c | 5 +---- > target/m68k/cpu.c | 4 +--- > target/openrisc/cpu.c | 4 +--- > target/riscv/cpu.c | 4 +--- > target/rx/cpu.c | 2 +- > target/tricore/cpu.c | 4 +--- > target/xtensa/cpu.c | 4 +--- > 13 files changed, 14 insertions(+), 35 deletions(-) > > diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c > index 2d24261a6a..f4a2ccebea 100644 > --- a/hw/core/cpu-common.c > +++ b/hw/core/cpu-common.c > @@ -157,7 +157,8 @@ ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) > cc = CPU_CLASS(oc); > assert(cc->cpu_resolving_type && cc->class_by_name); > oc = cc->class_by_name(cpu_model); > - if (oc == NULL || object_class_is_abstract(oc)) { > + if (oc == NULL || object_class_is_abstract(oc) > + || !object_class_dynamic_cast(oc, cc->cpu_resolving_type)) { > return NULL; > } > return oc; Alignment. if (!oc || object_class_is_abstract(oc) || !object_class_dynamic_cast(oc, cc->cpu_resolving_type)) { > diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c > index 0ddea8004c..b184fcc123 100644 > --- a/target/alpha/cpu.c > +++ b/target/alpha/cpu.c > @@ -126,8 +126,7 @@ static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model) > int i; > > oc = object_class_by_name(cpu_model); > - if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL && > - !object_class_is_abstract(oc)) { > + if (oc != NULL && !object_class_is_abstract(oc)) { > return oc; > } > No, the check "!object_class_is_abstract(oc)" for this level can't be dropped. The same check for the last level can be dropped because it's going to be covered by hw/core/cpu-common.c::cpu_class_by_name(). > diff --git a/target/arm/cpu.c b/target/arm/cpu.c > index 9e51bde170..d29040cd8c 100644 > --- a/target/arm/cpu.c > +++ b/target/arm/cpu.c > @@ -2300,9 +2300,7 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) > oc = object_class_by_name(typename); > g_strfreev(cpuname); > g_free(typename); > - if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/avr/cpu.c b/target/avr/cpu.c > index f6004169ac..53735ff1dd 100644 > --- a/target/avr/cpu.c > +++ b/target/avr/cpu.c > @@ -159,9 +159,7 @@ static ObjectClass *avr_cpu_class_by_name(const char *cpu_model) > ObjectClass *oc; > > oc = object_class_by_name(cpu_model); > - if (object_class_dynamic_cast(oc, TYPE_AVR_CPU) == NULL) { > - oc = NULL; > - } > + > return oc; > } > > diff --git a/target/cris/cpu.c b/target/cris/cpu.c > index adde4f599d..b307d0b9db 100644 > --- a/target/cris/cpu.c > +++ b/target/cris/cpu.c > @@ -95,9 +95,7 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(CRIS_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (oc != NULL && !object_class_dynamic_cast(oc, TYPE_CRIS_CPU)) { > - oc = NULL; > - } > + > return oc; > } > > diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c > index 2d4fed838d..4b8d63c4a7 100644 > --- a/target/hexagon/cpu.c > +++ b/target/hexagon/cpu.c > @@ -63,9 +63,7 @@ static ObjectClass *hexagon_cpu_class_by_name(const char *cpu_model) > oc = object_class_by_name(typename); > g_strfreev(cpuname); > g_free(typename); > - if (!oc || !object_class_dynamic_cast(oc, TYPE_HEXAGON_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c > index 189dfd32d1..1eb2c579eb 100644 > --- a/target/loongarch/cpu.c > +++ b/target/loongarch/cpu.c > @@ -646,10 +646,7 @@ static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model) > } > } > > - if (object_class_dynamic_cast(oc, TYPE_LOONGARCH_CPU)) { > - return oc; > - } > - return NULL; > + return oc; > } > > void loongarch_cpu_dump_state(CPUState *cs, FILE *f, int flags) > diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c > index bd7bb103d7..e8b86c80f1 100644 > --- a/target/m68k/cpu.c > +++ b/target/m68k/cpu.c > @@ -111,9 +111,7 @@ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(M68K_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (oc != NULL && object_class_dynamic_cast(oc, TYPE_M68K_CPU) == NULL) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c > index 5e1e0576e0..7aac9105bd 100644 > --- a/target/openrisc/cpu.c > +++ b/target/openrisc/cpu.c > @@ -168,9 +168,7 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(OPENRISC_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (oc != NULL && !object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index e8f04ef82b..0170e288e7 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -619,9 +619,7 @@ static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model) > oc = object_class_by_name(typename); > g_strfreev(cpuname); > g_free(typename); > - if (!oc || !object_class_dynamic_cast(oc, TYPE_RISCV_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/rx/cpu.c b/target/rx/cpu.c > index 2a6df418a8..879d4fcdef 100644 > --- a/target/rx/cpu.c > +++ b/target/rx/cpu.c > @@ -111,7 +111,7 @@ static ObjectClass *rx_cpu_class_by_name(const char *cpu_model) > char *typename; > > oc = object_class_by_name(cpu_model); > - if (oc != NULL && object_class_dynamic_cast(oc, TYPE_RX_CPU) != NULL) { > + if (oc != NULL) { > return oc; > } > typename = g_strdup_printf(RX_CPU_TYPE_NAME("%s"), cpu_model); Same as above. The check (object_class_dynamic_cast()) can't be dropped in this level. Besides, the check object_class_is_abstract() is missed for this level. > diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c > index ffe5158786..f65b8761b0 100644 > --- a/target/tricore/cpu.c > +++ b/target/tricore/cpu.c > @@ -140,9 +140,7 @@ static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(TRICORE_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (!oc || !object_class_dynamic_cast(oc, TYPE_TRICORE_CPU)) { > - return NULL; > - } > + > return oc; > } > > diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c > index 13bed05d0c..6d96e5ab27 100644 > --- a/target/xtensa/cpu.c > +++ b/target/xtensa/cpu.c > @@ -141,9 +141,7 @@ static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model) > typename = g_strdup_printf(XTENSA_CPU_TYPE_NAME("%s"), cpu_model); > oc = object_class_by_name(typename); > g_free(typename); > - if (oc == NULL || !object_class_dynamic_cast(oc, TYPE_XTENSA_CPU)) { > - return NULL; > - } > + > return oc; > } > Thanks, Gavin