llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-sparc Author: Aiden Grossman (boomanaiden154) <details> <summary>Changes</summary> Standard CodeGenPassBuilder construction for the NewPM. Assisted-By: LLM (test assertion generation) --- Full diff: https://github.com/llvm/llvm-project/pull/237613.diff 5 Files Affected: - (modified) llvm/lib/Target/Sparc/CMakeLists.txt (+2) - (added) llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp (+91) - (added) llvm/lib/Target/Sparc/SparcPassRegistry.def (+20) - (modified) llvm/lib/Target/Sparc/SparcTargetMachine.h (+8) - (added) llvm/test/CodeGen/SPARC/newpm-pipeline.ll (+91) ``````````diff diff --git a/llvm/lib/Target/Sparc/CMakeLists.txt b/llvm/lib/Target/Sparc/CMakeLists.txt index c915add38dcf2b..59bade5fc55a42 100644 --- a/llvm/lib/Target/Sparc/CMakeLists.txt +++ b/llvm/lib/Target/Sparc/CMakeLists.txt @@ -23,6 +23,7 @@ add_llvm_target(SparcCodeGen DelaySlotFiller.cpp LeonPasses.cpp SparcAsmPrinter.cpp + SparcCodeGenPassBuilder.cpp SparcInstrInfo.cpp SparcISelDAGToDAG.cpp SparcISelLowering.cpp @@ -43,6 +44,7 @@ add_llvm_target(SparcCodeGen Core MC Option + Passes SelectionDAG SparcDesc SparcInfo diff --git a/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp b/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp new file mode 100644 index 00000000000000..976a7cc22c4815 --- /dev/null +++ b/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp @@ -0,0 +1,91 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "Sparc.h" +#include "SparcTargetMachine.h" +#include "llvm/CodeGen/AtomicExpand.h" +#include "llvm/CodeGen/BranchRelaxation.h" +#include "llvm/IR/PassInstrumentation.h" +#include "llvm/Passes/CodeGenPassBuilder.h" +#include "llvm/Passes/PassBuilder.h" +#include "llvm/Target/CGPassBuilderOption.h" + +using namespace llvm; + +namespace { + +class SparcCodeGenPassBuilder : public CodeGenPassBuilder { + using Base = CodeGenPassBuilder; + + SparcTargetMachine &getTM() const { + return static_cast<SparcTargetMachine &>(TM); + } + +public: + explicit SparcCodeGenPassBuilder(SparcTargetMachine &TM, + const CGPassBuilderOption &Opts, + PassInstrumentationCallbacks *PIC) + : CodeGenPassBuilder(TM, Opts, PIC) {} + + void addIRPasses(PassManagerWrapper &PMW) override; + Error addInstSelector(PassManagerWrapper &PMW) override; + void addPreEmitPass(PassManagerWrapper &PMW) override; + void addAsmPrinterBegin(PassManagerWrapper &PMW) override; + void addAsmPrinter(PassManagerWrapper &PMW) override; + void addAsmPrinterEnd(PassManagerWrapper &PMW) override; +}; + +void SparcCodeGenPassBuilder::addIRPasses(PassManagerWrapper &PMW) { + addFunctionPass(AtomicExpandPass(getTM()), PMW); + + Base::addIRPasses(PMW); +} + +Error SparcCodeGenPassBuilder::addInstSelector(PassManagerWrapper &PMW) { + addMachineFunctionPass(SparcDAGToDAGISelPass(getTM(), getOptLevel()), PMW); + return Error::success(); +} + +void SparcCodeGenPassBuilder::addPreEmitPass(PassManagerWrapper &PMW) { + if (getTM().getCLOpts().enable_branch_relax) + addMachineFunctionPass(BranchRelaxationPass(), PMW); + + // TODO(boomanaiden154): Add SparcDelaySlotFillerPass + // TODO(boomanaiden154): Add SparcInsertNOPLoadPass + // TODO(boomanaiden154): Add SparcDetectRoundChangePass + // TODO(boomanaiden154): Add SparcFixAllFDIVSQRTPass + // TODO(boomanaiden154): Add SparcErrataWorkaroundPass +} + +void SparcCodeGenPassBuilder::addAsmPrinterBegin(PassManagerWrapper &PMW) { + // TODO(boomanaiden154): Add SparcAsmPrinterBegin +} + +void SparcCodeGenPassBuilder::addAsmPrinter(PassManagerWrapper &PMW) { + // TODO(boomanaiden154): Add SparcAsmPrinter +} + +void SparcCodeGenPassBuilder::addAsmPrinterEnd(PassManagerWrapper &PMW) { + // TODO(boomanaiden154): Add SparcAsmPrinterEnd +} + +} // namespace + +void SparcTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB){ +#define GET_PASS_REGISTRY "SparcPassRegistry.def" +#include "llvm/Passes/TargetPassRegistry.inc" +} + +Error SparcTargetMachine::buildCodeGenPipeline( + ModulePassManager &MPM, ModuleAnalysisManager &MAM, raw_pwrite_stream &Out, + raw_pwrite_stream *DwoOut, CodeGenFileType FileType, + const CGPassBuilderOption &Opt, MCContext &Ctx, + PassInstrumentationCallbacks *PIC) { + auto CGPB = SparcCodeGenPassBuilder(*this, Opt, PIC); + return CGPB.buildPipeline(MPM, MAM, Out, DwoOut, FileType, Ctx); +} diff --git a/llvm/lib/Target/Sparc/SparcPassRegistry.def b/llvm/lib/Target/Sparc/SparcPassRegistry.def new file mode 100644 index 00000000000000..b80c85c4c4a0b3 --- /dev/null +++ b/llvm/lib/Target/Sparc/SparcPassRegistry.def @@ -0,0 +1,20 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// This file is used as the registry of passes that are part of the AVR +// backend. +// +//===----------------------------------------------------------------------===// + +// NOTE: NO INCLUDE GUARD DESIRED! + +#ifndef MACHINE_FUNCTION_PASS +#define MACHINE_FUNCTION_PASS(NAME, CREATE_PASS) +#endif +MACHINE_FUNCTION_PASS("sparc-isel", SparcDAGToDAGISelPass(*this, getOptLevel())) +#undef MACHINE_FUNCTION_PASS diff --git a/llvm/lib/Target/Sparc/SparcTargetMachine.h b/llvm/lib/Target/Sparc/SparcTargetMachine.h index 28b4cb24e2242c..cc10caa945f15d 100644 --- a/llvm/lib/Target/Sparc/SparcTargetMachine.h +++ b/llvm/lib/Target/Sparc/SparcTargetMachine.h @@ -48,6 +48,14 @@ class SparcTargetMachine : public CodeGenTargetMachineImpl { MachineFunctionInfo * createMachineFunctionInfo(BumpPtrAllocator &Allocator, const Function &F, const TargetSubtargetInfo *STI) const override; + + void registerPassBuilderCallbacks(PassBuilder &PB) override; + + Error buildCodeGenPipeline(ModulePassManager &MPM, ModuleAnalysisManager &MAM, + raw_pwrite_stream &Out, raw_pwrite_stream *DwoOut, + CodeGenFileType FileType, + const CGPassBuilderOption &Opt, MCContext &Ctx, + PassInstrumentationCallbacks *PIC) override; }; /// Sparc 32-bit target machine diff --git a/llvm/test/CodeGen/SPARC/newpm-pipeline.ll b/llvm/test/CodeGen/SPARC/newpm-pipeline.ll new file mode 100644 index 00000000000000..cf35997136f854 --- /dev/null +++ b/llvm/test/CodeGen/SPARC/newpm-pipeline.ll @@ -0,0 +1,91 @@ +; RUN: llc -enable-new-pm -mtriple=sparcv9 -O3 -sparc-enable-branch-relax=false -print-pipeline-passes=tree < %s 2>&1 \ +; RUN: | FileCheck %s --check-prefix=SPARC +; RUN: llc -enable-new-pm -mtriple=sparcv9 -O3 -print-pipeline-passes=tree < %s 2>&1 \ +; RUN: | FileCheck %s --check-prefixes=SPARC,SPARC-BR-RELAX + +; SPARC: require<MachineModuleAnalysis> +; SPARC-NEXT: require<profile-summary> +; SPARC-NEXT: require<collector-metadata> +; SPARC-NEXT: require<runtime-libcall-info> +; SPARC-NEXT: require<libcall-lowering-info> +; SPARC-NEXT: function +; SPARC-NEXT: objc-arc-contract +; SPARC-NEXT: pre-isel-intrinsic-lowering +; SPARC-NEXT: function +; SPARC-NEXT: expand-ir-insts<O3> +; SPARC-NEXT: atomic-expand +; SPARC-NEXT: verify +; SPARC-NEXT: loop +; SPARC-NEXT: canon-freeze +; SPARC-NEXT: loop-reduce +; SPARC-NEXT: gc-lowering +; SPARC-NEXT: shadow-stack-gc-lowering +; SPARC-NEXT: function +; SPARC-NEXT: unreachableblockelim +; SPARC-NEXT: consthoist +; SPARC-NEXT: replace-with-veclib +; SPARC-NEXT: partially-inline-libcalls +; SPARC-NEXT: ee-instrument<post-inline> +; SPARC-NEXT: scalarize-masked-mem-intrin +; SPARC-NEXT: expand-reductions +; SPARC-NEXT: codegenprepare +; SPARC-NEXT: sjlj-eh-prepare +; SPARC-NEXT: dwarf-eh-prepare +; SPARC-NEXT: inline-asm-prepare +; SPARC-NEXT: safe-stack +; SPARC-NEXT: stack-protector +; SPARC-NEXT: verify +; SPARC-NEXT: function +; SPARC-NEXT: machine-function +; SPARC-NEXT: sparc-isel +; SPARC-NEXT: finalize-isel +; SPARC-NEXT: early-tailduplication +; SPARC-NEXT: opt-phis +; SPARC-NEXT: stack-coloring +; SPARC-NEXT: localstackalloc +; SPARC-NEXT: dead-mi-elimination +; SPARC-NEXT: early-machinelicm +; SPARC-NEXT: machine-cse +; SPARC-NEXT: machine-sink +; SPARC-NEXT: peephole-opt +; SPARC-NEXT: dead-mi-elimination +; SPARC-NEXT: detect-dead-lanes +; SPARC-NEXT: init-undef +; SPARC-NEXT: process-implicit-defs +; SPARC-NEXT: unreachable-mbb-elimination +; SPARC-NEXT: require<live-intervals> +; SPARC-NEXT: require<machine-loops> +; SPARC-NEXT: phi-node-elimination +; SPARC-NEXT: two-address-instruction +; SPARC-NEXT: register-coalescer +; SPARC-NEXT: rename-independent-subregs +; SPARC-NEXT: machine-scheduler +; SPARC-NEXT: greedy<all> +; SPARC-NEXT: virt-reg-rewriter +; SPARC-NEXT: stack-slot-coloring +; SPARC-NEXT: machine-cp +; SPARC-NEXT: machinelicm +; SPARC-NEXT: remove-redundant-debug-values +; SPARC-NEXT: fixup-statepoint-caller-saved +; SPARC-NEXT: postra-machine-sink +; SPARC-NEXT: shrink-wrap +; SPARC-NEXT: prolog-epilog +; SPARC-NEXT: machine-latecleanup +; SPARC-NEXT: branch-folder +; SPARC-NEXT: tailduplication +; SPARC-NEXT: machine-cp +; SPARC-NEXT: post-ra-pseudos +; SPARC-NEXT: post-RA-sched +; SPARC-NEXT: block-placement +; SPARC-NEXT: fentry-insert +; SPARC-NEXT: xray-instrumentation +; SPARC-NEXT: patchable-function +; SPARC-BR-RELAX-NEXT: branch-relaxation +; SPARC-NEXT: funclet-layout +; SPARC-NEXT: remove-loads-into-fake-uses +; SPARC-NEXT: StackMapLivenessPass +; SPARC-NEXT: live-debug-values +; SPARC-NEXT: machine-sanmd +; SPARC-NEXT: stack-frame-layout +; SPARC-NEXT: verify +; SPARC-NEXT: free-machine-function `````````` </details> https://github.com/llvm/llvm-project/pull/237613 _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
