linjamaki created this revision. Herald added subscribers: ThomasRaoux, dang, mgorny. linjamaki requested review of this revision. Herald added a project: clang. Herald added a subscriber: cfe-commits.
Add a tool for constructing commands for translating LLVM IR to SPIR-V. Used by HIPSPV tool chain (D110618 <https://reviews.llvm.org/D110618>). Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D112404 Files: clang/include/clang/Driver/Options.td clang/lib/Driver/CMakeLists.txt clang/lib/Driver/ToolChains/SPIRV.cpp clang/lib/Driver/ToolChains/SPIRV.h
Index: clang/lib/Driver/ToolChains/SPIRV.h =================================================================== --- /dev/null +++ clang/lib/Driver/ToolChains/SPIRV.h @@ -0,0 +1,46 @@ +//===--- SPIRV.h - SPIR-V Tool Implementations ------------------*- C++ -*-===// +// +// 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 +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_SPIRV_H +#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_SPIRV_H + +#include "clang/Driver/Tool.h" +#include "clang/Driver/ToolChain.h" + +namespace clang { +namespace driver { +namespace tools { +namespace SPIRV { + +void addTranslatorArgs(const llvm::opt::ArgList &InArgs, + llvm::opt::ArgStringList &OutArgs); + +void constructTranslateCommand(Compilation &C, const Tool &T, + const JobAction &JA, const InputInfo &Output, + const InputInfo &Input, + const llvm::opt::ArgStringList &Args); + +class LLVM_LIBRARY_VISIBILITY Translator : public Tool { +public: + Translator(const ToolChain &TC) + : Tool("SPIRV::Translator", "translator", TC) {} + + bool hasIntegratedCPP() const override { return false; } + bool hasIntegratedAssembler() const override { return true; } + + void ConstructJob(Compilation &C, const JobAction &JA, + const InputInfo &Output, const InputInfoList &Inputs, + const llvm::opt::ArgList &TCArgs, + const char *LinkingOutput) const override; +}; + +} // namespace SPIRV +} // namespace tools +} // namespace driver +} // namespace clang +#endif Index: clang/lib/Driver/ToolChains/SPIRV.cpp =================================================================== --- /dev/null +++ clang/lib/Driver/ToolChains/SPIRV.cpp @@ -0,0 +1,55 @@ +//===--- SPIRV.cpp - SPIR-V Tool Implementations ----------------*- C++ -*-===// +// +// 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 "SPIRV.h" +#include "CommonArgs.h" +#include "clang/Driver/Compilation.h" +#include "clang/Driver/Driver.h" +#include "clang/Driver/InputInfo.h" +#include "clang/Driver/Options.h" + +using namespace clang::driver::tools; +using namespace llvm::opt; + +void SPIRV::addTranslatorArgs(const ArgList &InArgs, ArgStringList &OutArgs) { + InArgs.AddLastArg(OutArgs, options::OPT_spirv_max_version_EQ, + options::OPT_spirv_ext_EQ); +} + +void SPIRV::constructTranslateCommand(Compilation &C, const Tool &T, + const JobAction &JA, + const InputInfo &Output, + const InputInfo &Input, + const llvm::opt::ArgStringList &Args) { + llvm::opt::ArgStringList CmdArgs(Args); + CmdArgs.push_back(Input.getFilename()); + + if (Input.getType() == types::TY_PP_Asm) + CmdArgs.push_back("-to-binary"); + if (Output.getType() == types::TY_PP_Asm) + CmdArgs.push_back("-spirv-text"); + + CmdArgs.append({"-o", Output.getFilename()}); + + const char *Exec = + C.getArgs().MakeArgString(T.getToolChain().GetProgramPath("llvm-spirv")); + C.addCommand(std::make_unique<Command>(JA, T, ResponseFileSupport::None(), + Exec, CmdArgs, Input, Output)); +} + +void SPIRV::Translator::ConstructJob(Compilation &C, const JobAction &JA, + const InputInfo &Output, + const InputInfoList &Inputs, + const ArgList &Args, + const char *LinkingOutput) const { + claimNoWarnArgs(Args); + ArgStringList FilteredArgs; + addTranslatorArgs(Args, FilteredArgs); + if (Inputs.size() != 1) + llvm_unreachable("Invalid number of input files."); + constructTranslateCommand(C, *this, JA, Output, Inputs[0], FilteredArgs); +} Index: clang/lib/Driver/CMakeLists.txt =================================================================== --- clang/lib/Driver/CMakeLists.txt +++ clang/lib/Driver/CMakeLists.txt @@ -69,6 +69,7 @@ ToolChains/PS4CPU.cpp ToolChains/RISCVToolchain.cpp ToolChains/Solaris.cpp + ToolChains/SPIRV.cpp ToolChains/TCE.cpp ToolChains/VEToolchain.cpp ToolChains/WebAssembly.cpp Index: clang/include/clang/Driver/Options.td =================================================================== --- clang/include/clang/Driver/Options.td +++ clang/include/clang/Driver/Options.td @@ -1529,6 +1529,13 @@ Group<f_Group>, Flags<[CC1Option]>, MetaVarName<"<directory>">, HelpText<"Enable heap memory profiling and dump results into <directory>">; +def spirv_max_version_EQ : Joined<["--"], "spirv-max-version">, + HelpText<"Specify maximum SPIR-V version which can be emitted">; +def spirv_ext_EQ : CommaJoined<["--"], "spirv-ext">, + HelpText<"Specify comma separated list of allowed/disallowed SPIR-V " + "extensions prefixed with '+' or '-'. '+' and '-' allows and disallows " + "the extension, respectively. Special value 'all' affects all extensions">; + // Begin sanitizer flags. These should all be core options exposed in all driver // modes. let Flags = [CC1Option, CoreOption] in {
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
