Unverified Commit a207e630 authored by Tom Eccles's avatar Tom Eccles Committed by GitHub
Browse files

[flang] add fveclib flag (#71734) 

-fveclib= allows users to choose a vectorized libm so that loops
containing math functions are vectorized.

This is implemented as much as possible in the same way as in clang. The
driver test in veclib.f90 is copied from the clang test.
parent 4cc791bc

clang/include/clang/Basic/CodeGenOptions.def

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ ENUM_CODEGENOPT(Inlining, InliningMethod, 2, NormalInlining) 
VALUE_CODEGENOPT(InlineMaxStackSize, 32, UINT_MAX)



// Vector functions library to use.

ENUM_CODEGENOPT(VecLib, VectorLibrary, 3, NoLibrary)

ENUM_CODEGENOPT(VecLib, llvm::driver::VectorLibrary, 3, llvm::driver::VectorLibrary::NoLibrary)



/// The default TLS model to use.

ENUM_CODEGENOPT(DefaultTLSModel, TLSModel, 2, GeneralDynamicTLSModel)

clang/include/clang/Basic/CodeGenOptions.h

+1 −11
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "clang/Basic/XRayInstr.h"

#include "llvm/ADT/FloatingPointMode.h"

#include "llvm/Frontend/Debug/Options.h"

#include "llvm/Frontend/Driver/CodeGenOptions.h"

#include "llvm/Support/CodeGen.h"

#include "llvm/Support/Regex.h"

#include "llvm/Target/TargetOptions.h"
@@ -58,17 +59,6 @@ public: 
    OnlyAlwaysInlining  // Only run the always inlining pass.

  };



  enum VectorLibrary {

    NoLibrary,  // Don't use any vector library.

    Accelerate, // Use the Accelerate framework.

    LIBMVEC,    // GLIBC vector math library.

    MASSV,      // IBM MASS vector library.

    SVML,       // Intel short vector math library.

    SLEEF,      // SLEEF SIMD Library for Evaluating Elementary Functions.

    Darwin_libsystem_m, // Use Darwin's libsytem_m vector functions.

    ArmPL               // Arm Performance Libraries.

  };



  enum ObjCDispatchMethodKind {

    Legacy = 0,

    NonLegacy = 1,

clang/include/clang/Driver/Options.td

+2 −2
Original line number Diff line number Diff line
@@ -3126,10 +3126,10 @@ def fno_global_isel : Flag<["-"], "fno-global-isel">, Group<f_clang_Group>, 
def fno_experimental_isel : Flag<["-"], "fno-experimental-isel">, Group<f_clang_Group>,

  Alias<fno_global_isel>;

def fveclib : Joined<["-"], "fveclib=">, Group<f_Group>,

  Visibility<[ClangOption, CC1Option]>,

  Visibility<[ClangOption, CC1Option, FlangOption, FC1Option]>,

    HelpText<"Use the given vector functions library">,

    Values<"Accelerate,libmvec,MASSV,SVML,SLEEF,Darwin_libsystem_m,ArmPL,none">,

    NormalizedValuesScope<"CodeGenOptions">,

    NormalizedValuesScope<"llvm::driver::VectorLibrary">,

    NormalizedValues<["Accelerate", "LIBMVEC", "MASSV", "SVML", "SLEEF",

                      "Darwin_libsystem_m", "ArmPL", "NoLibrary"]>,

    MarshallingInfoEnum<CodeGenOpts<"VecLib">, "NoLibrary">;

clang/lib/CodeGen/BackendUtil.cpp

+3 −41
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "llvm/CodeGen/RegAllocRegistry.h"

#include "llvm/CodeGen/SchedulerRegistry.h"

#include "llvm/CodeGen/TargetSubtargetInfo.h"

#include "llvm/Frontend/Driver/CodeGenOptions.h"

#include "llvm/IR/DataLayout.h"

#include "llvm/IR/DebugInfo.h"

#include "llvm/IR/LegacyPassManager.h"
@@ -264,45 +265,6 @@ static bool asanUseGlobalsGC(const Triple &T, const CodeGenOptions &CGOpts) { 
  return false;

}



static TargetLibraryInfoImpl *createTLII(llvm::Triple &TargetTriple,

                                         const CodeGenOptions &CodeGenOpts) {

  TargetLibraryInfoImpl *TLII = new TargetLibraryInfoImpl(TargetTriple);



  switch (CodeGenOpts.getVecLib()) {

  case CodeGenOptions::Accelerate:

    TLII->addVectorizableFunctionsFromVecLib(TargetLibraryInfoImpl::Accelerate,

                                             TargetTriple);

    break;

  case CodeGenOptions::LIBMVEC:

    TLII->addVectorizableFunctionsFromVecLib(TargetLibraryInfoImpl::LIBMVEC_X86,

                                             TargetTriple);

    break;

  case CodeGenOptions::MASSV:

    TLII->addVectorizableFunctionsFromVecLib(TargetLibraryInfoImpl::MASSV,

                                             TargetTriple);

    break;

  case CodeGenOptions::SVML:

    TLII->addVectorizableFunctionsFromVecLib(TargetLibraryInfoImpl::SVML,

                                             TargetTriple);

    break;

  case CodeGenOptions::SLEEF:

    TLII->addVectorizableFunctionsFromVecLib(TargetLibraryInfoImpl::SLEEFGNUABI,

                                             TargetTriple);

    break;

  case CodeGenOptions::Darwin_libsystem_m:

    TLII->addVectorizableFunctionsFromVecLib(

        TargetLibraryInfoImpl::DarwinLibSystemM, TargetTriple);

    break;

  case CodeGenOptions::ArmPL:

    TLII->addVectorizableFunctionsFromVecLib(TargetLibraryInfoImpl::ArmPL,

                                             TargetTriple);

    break;

  default:

    break;

  }

  return TLII;

}



static std::optional<llvm::CodeModel::Model>

getCodeModel(const CodeGenOptions &CodeGenOpts) {

  unsigned CodeModel = llvm::StringSwitch<unsigned>(CodeGenOpts.CodeModel)
@@ -590,7 +552,7 @@ bool EmitAssemblyHelper::AddEmitPasses(legacy::PassManager &CodeGenPasses, 
                                       raw_pwrite_stream *DwoOS) {

  // Add LibraryInfo.

  std::unique_ptr<TargetLibraryInfoImpl> TLII(

      createTLII(TargetTriple, CodeGenOpts));

      llvm::driver::createTLII(TargetTriple, CodeGenOpts.getVecLib()));

  CodeGenPasses.add(new TargetLibraryInfoWrapperPass(*TLII));



  // Normal mode, emit a .s or .o file by running the code generator. Note,
@@ -923,7 +885,7 @@ void EmitAssemblyHelper::RunOptimizationPipeline( 
  // Register the target library analysis directly and give it a customized

  // preset TLI.

  std::unique_ptr<TargetLibraryInfoImpl> TLII(

      createTLII(TargetTriple, CodeGenOpts));

      llvm::driver::createTLII(TargetTriple, CodeGenOpts.getVecLib()));

  FAM.registerPass([&] { return TargetLibraryAnalysis(*TLII); });



  // Register all the basic analyses with the managers.

clang/lib/CodeGen/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ set(LLVM_LINK_COMPONENTS 
  Coverage

  Demangle

  Extensions

  FrontendDriver

  FrontendHLSL

  FrontendOpenMP

  FrontendOffloading