From nobody Sat Nov 23 17:10:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1732153987; cv=none; d=zohomail.com; s=zohoarc; b=JZuqkRG07vIlPSg5CegTE4NsDPue24I0kGa+qDehApIvAYi0pFCsKfS+1cCfqt1ZQ2PnYz1DCLrJRKAZSVQ9ifb/X6CERsL1Sys0LfmzIwd1ofu8SC8HgE5NibREOLw+VKpZhyhr3RZmJi5yDbsn6AhfSLpzS+Z5xkWJtLGbNWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732153987; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=lmWGLOze3SuRS/fAHZcf3ZMhqPnKfajIC31FbL7DQy4=; b=Px3rGLdJjQhuVl8g0e6MJT/wxmRLYFr24L3DcBIHdeJmu7cc0crODC1oA+cScMG9/tgjxwxdxvHhc7CBn6TFsvJMIQoCkRHFWm5gYb6eNAWO7aEfoWj0ZugaHRJOmvQ83t9sMIGJZJCoFmVPKp1npGUyOwQs6HJMdrDu3R0pwKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1732153987139817.7591636343519; Wed, 20 Nov 2024 17:53:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDwHt-0001cf-4W; Wed, 20 Nov 2024 20:47:17 -0500 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 1tDwHr-0001b0-2o for qemu-devel@nongnu.org; Wed, 20 Nov 2024 20:47:15 -0500 Received: from rev.ng ([94.130.142.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDwHo-0004Xd-Um for qemu-devel@nongnu.org; Wed, 20 Nov 2024 20:47:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive:List-Unsubscribe:List-Unsubscribe-Post: List-Help; bh=lmWGLOze3SuRS/fAHZcf3ZMhqPnKfajIC31FbL7DQy4=; b=NtKZojsW4OM2ES9 t+zx3ibbMJSZEnIAu6650ysyhwmS0QWy0JKdaK4i2rn3DNUvG5ocwzMFlMkJMyaVtcuGu0MmDJA9l VItuhIQ5DVPVNXjcsYjW7kSQuLTXnEzHm7rkWzQTi7u2FXbWfHQoTVEgl+JmVvEDuY6ZILsSuv/+Q 3s=; To: qemu-devel@nongnu.org Cc: ale@rev.ng, ltaylorsimpson@gmail.com, bcain@quicinc.com, richard.henderson@linaro.org, philmd@linaro.org, alex.bennee@linaro.org Subject: [RFC PATCH v1 15/43] helper-to-tcg: PrepareForOptPass, map annotations Date: Thu, 21 Nov 2024 02:49:19 +0100 Message-ID: <20241121014947.18666-16-anjo@rev.ng> In-Reply-To: <20241121014947.18666-1-anjo@rev.ng> References: <20241121014947.18666-1-anjo@rev.ng> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.130.142.21; envelope-from=anjo@rev.ng; helo=rev.ng 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: , Reply-to: Anton Johansson From: Anton Johansson via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1732153989315116600 Content-Type: text/plain; charset="utf-8" In the LLVM IR module function annotations are stored in one big global array of strings. Traverse this array and parse the data into a format more useful for future passes. A map between Functions * and a list of annotations is exposed. Signed-off-by: Anton Johansson --- .../include/FunctionAnnotation.h | 54 ++++++++++++ .../helper-to-tcg/include/PrepareForOptPass.h | 7 +- .../PrepareForOptPass/PrepareForOptPass.cpp | 87 +++++++++++++++++++ .../helper-to-tcg/pipeline/Pipeline.cpp | 3 +- 4 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 subprojects/helper-to-tcg/include/FunctionAnnotation.h diff --git a/subprojects/helper-to-tcg/include/FunctionAnnotation.h b/subpr= ojects/helper-to-tcg/include/FunctionAnnotation.h new file mode 100644 index 0000000000..b562f7c892 --- /dev/null +++ b/subprojects/helper-to-tcg/include/FunctionAnnotation.h @@ -0,0 +1,54 @@ +// +// Copyright(c) 2024 rev.ng Labs Srl. 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 . +// + +#pragma once + +#include +#include +#include + +namespace llvm +{ +class Function; +} + +// Different kind of function annotations which control the behaviour +// of helper-to-tcg. +enum class AnnotationKind : uint8_t { + // Function should be translated + HelperToTcg, + // Declares a list of arguments as immediates + Immediate, + // Declares a list of arguments as vectors, represented by offsets into + // the CPU state + PtrToOffset, +}; + +// Annotation data which may be attached to a function +struct Annotation { + // Indices of function arguments the annotation applies to, only + // used for AnnotationKind::[Immediate|PtrToOffset]. + llvm::SmallVector ArgIndices; + AnnotationKind Kind; +}; + +// Map from Function * to a list of struct Annotation. std::map is used h= ere +// which allocates for each mapped pair due to the value being large +// (at least 48*3 bits). If ArgIndices were to be stored out-of-band this= could +// be reduced, and DenseMap would be more appropriate. +using AnnotationVectorTy =3D llvm::SmallVector; +using AnnotationMapTy =3D llvm::DenseMap; diff --git a/subprojects/helper-to-tcg/include/PrepareForOptPass.h b/subpro= jects/helper-to-tcg/include/PrepareForOptPass.h index d74618613f..5f9c059b97 100644 --- a/subprojects/helper-to-tcg/include/PrepareForOptPass.h +++ b/subprojects/helper-to-tcg/include/PrepareForOptPass.h @@ -17,6 +17,7 @@ =20 #pragma once =20 +#include "FunctionAnnotation.h" #include =20 // @@ -27,8 +28,12 @@ // =20 class PrepareForOptPass : public llvm::PassInfoMixin { + AnnotationMapTy &ResultAnnotations; public: - PrepareForOptPass() {} + PrepareForOptPass(AnnotationMapTy &ResultAnnotations) + : ResultAnnotations(ResultAnnotations) + { + } llvm::PreservedAnalyses run(llvm::Module &M, llvm::ModuleAnalysisManager &MAM); }; diff --git a/subprojects/helper-to-tcg/passes/PrepareForOptPass/PrepareForO= ptPass.cpp b/subprojects/helper-to-tcg/passes/PrepareForOptPass/PrepareForO= ptPass.cpp index 0a018494fe..9f1d4df102 100644 --- a/subprojects/helper-to-tcg/passes/PrepareForOptPass/PrepareForOptPass.= cpp +++ b/subprojects/helper-to-tcg/passes/PrepareForOptPass/PrepareForOptPass.= cpp @@ -16,10 +16,97 @@ // =20 #include +#include + +#include +#include +#include +#include =20 using namespace llvm; =20 +static Expected parseAnnotationStr(StringRef Str, + uint32_t num_function_args) +{ + Annotation Ann; + + Str =3D Str.trim(); + + if (Str.consume_front("helper-to-tcg")) { + Ann.Kind =3D AnnotationKind::HelperToTcg; + // Early return, no additional info to parse from annotation string + return Ann; + } else if (Str.consume_front("immediate")) { + Ann.Kind =3D AnnotationKind::Immediate; + } else if (Str.consume_front("ptr-to-offset")) { + Ann.Kind =3D AnnotationKind::PtrToOffset; + } else { + return mkError("Unknown annotation"); + } + + // Parse comma separated list of argument indices + + if (!Str.consume_front(":")) { + return mkError("Expected \":\""); + } + + Str =3D Str.ltrim(' '); + do { + Str =3D Str.ltrim(' '); + uint32_t i =3D 0; + Str.consumeInteger(10, i); + if (i >=3D num_function_args) { + return mkError("Annotation has out of bounds argument index"); + } + Ann.ArgIndices.push_back(i); + } while (Str.consume_front(",")); + + return Ann; +} + +static void collectAnnotations(Module &M, AnnotationMapTy &ResultAnnotatio= ns) +{ + // cast over dyn_cast is being used here to + // assert that the structure of + // + // llvm.global.annotation + // + // is what we expect. + + GlobalVariable *GA =3D M.getGlobalVariable("llvm.global.annotations"); + if (!GA) { + return; + } + + // Get the metadata which is stored in the first op + auto *CA =3D cast(GA->getOperand(0)); + // Loop over metadata + for (Value *CAOp : CA->operands()) { + auto *Struct =3D cast(CAOp); + assert(Struct->getNumOperands() >=3D 2); + Constant *UseOfF =3D Struct->getOperand(0); + if (isa(UseOfF)) { + continue; + } + auto *F =3D cast(UseOfF->getOperand(0)); + auto *AnnVar =3D + cast(Struct->getOperand(1)->getOperand(0)); + auto *AnnData =3D cast(AnnVar->getOperand(0)); + + StringRef AnnStr =3D AnnData->getAsString(); + AnnStr =3D AnnStr.substr(0, AnnStr.size() - 1); + Expected Ann =3D parseAnnotationStr(AnnStr, F->arg_siz= e()); + if (!Ann) { + dbgs() << "Failed to parse annotation: \"" << Ann.takeError() + << "\" for function " << F->getName() << "\n"; + continue; + } + ResultAnnotations[F].push_back(*Ann); + } +} + PreservedAnalyses PrepareForOptPass::run(Module &M, ModuleAnalysisManager = &MAM) { + collectAnnotations(M, ResultAnnotations); return PreservedAnalyses::none(); } diff --git a/subprojects/helper-to-tcg/pipeline/Pipeline.cpp b/subprojects/= helper-to-tcg/pipeline/Pipeline.cpp index fad335f4a9..3b9493bc73 100644 --- a/subprojects/helper-to-tcg/pipeline/Pipeline.cpp +++ b/subprojects/helper-to-tcg/pipeline/Pipeline.cpp @@ -174,7 +174,8 @@ int main(int argc, char **argv) MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM))); } =20 - MPM.addPass(PrepareForOptPass()); + AnnotationMapTy Annotations; + MPM.addPass(PrepareForOptPass(Annotations)); =20 { FunctionPassManager FPM; --=20 2.45.2