From 49682f14bf3fb8db5e2721d9896b27bb4c2bd635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henry=20Linjam=C3=A4ki?= Date: Wed, 17 Nov 2021 11:23:49 +0300 Subject: [PATCH] [SPIR-V] Add translator tool Add a tool for constructing commands for translating LLVM IR to SPIR-V. Used by HIPSPV tool chain (D110618). Reviewed By: bader Differential Revision: https://reviews.llvm.org/D112404 --- clang/lib/Driver/CMakeLists.txt | 1 + clang/lib/Driver/ToolChains/SPIRV.cpp | 48 +++++++++++++++++++++++++++ clang/lib/Driver/ToolChains/SPIRV.h | 46 +++++++++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 clang/lib/Driver/ToolChains/SPIRV.cpp create mode 100644 clang/lib/Driver/ToolChains/SPIRV.h diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt index 61a1cd04e0888..31e357b67361d 100644 --- a/clang/lib/Driver/CMakeLists.txt +++ b/clang/lib/Driver/CMakeLists.txt @@ -69,6 +69,7 @@ add_clang_library(clangDriver ToolChains/PS4CPU.cpp ToolChains/RISCVToolchain.cpp ToolChains/Solaris.cpp + ToolChains/SPIRV.cpp ToolChains/TCE.cpp ToolChains/VEToolchain.cpp ToolChains/WebAssembly.cpp diff --git a/clang/lib/Driver/ToolChains/SPIRV.cpp b/clang/lib/Driver/ToolChains/SPIRV.cpp new file mode 100644 index 0000000000000..3f942478e2add --- /dev/null +++ b/clang/lib/Driver/ToolChains/SPIRV.cpp @@ -0,0 +1,48 @@ +//===--- 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::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(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); + if (Inputs.size() != 1) + llvm_unreachable("Invalid number of input files."); + constructTranslateCommand(C, *this, JA, Output, Inputs[0], {}); +} diff --git a/clang/lib/Driver/ToolChains/SPIRV.h b/clang/lib/Driver/ToolChains/SPIRV.h new file mode 100644 index 0000000000000..35d0446bd8b84 --- /dev/null +++ b/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("SPIR-V::Translator", "llvm-spirv", 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