summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPierre Moreau <dev@pmoreau.org>2018-04-13 18:37:50 +0200
committerAlexey Sotkin <alexey.sotkin@intel.com>2018-04-24 12:21:49 +0300
commitaaa052985c2f0b2e44fe20ab7ff6b7e295b61907 (patch)
tree397511725aa6dc5cc628d233ba12eb21a5824099 /tools
parent04d74bf05bb1c16f50cfb6cbdd18d0effbfcf7c3 (diff)
Reformat all .cpp and .h files using clang-format
Commands run: * clang-format -i `find . -iname "*.cpp"` * clang-format -i `find . -iname "*.h"` Files manually reverted: * lib/SPIRV/libSPIRV/OpenCL.std.h * lib/SPIRV/runtime/OpenCL/inc/spirv.h * lib/SPIRV/runtime/OpenCL/inc/spirv_convert.h Files manually edited (to fix their first line): * lib/SPIRV/OCL20ToSPIRV.cpp * lib/SPIRV/OCL21ToSPIRV.cpp * lib/SPIRV/SPIRVInternal.h * lib/SPIRV/SPIRVLowerBool.cpp * lib/SPIRV/SPIRVLowerMemmove.cpp * lib/SPIRV/SPIRVToOCL20.cpp * lib/SPIRV/libSPIRV/SPIRVBasicBlock.cpp * lib/SPIRV/libSPIRV/SPIRVBasicBlock.h * lib/SPIRV/libSPIRV/SPIRVDebug.cpp * lib/SPIRV/libSPIRV/SPIRVDebug.h * lib/SPIRV/libSPIRV/SPIRVDecorate.cpp * lib/SPIRV/libSPIRV/SPIRVDecorate.h * lib/SPIRV/libSPIRV/SPIRVEntry.cpp * lib/SPIRV/libSPIRV/SPIRVEntry.h * lib/SPIRV/libSPIRV/SPIRVError.h * lib/SPIRV/libSPIRV/SPIRVExtInst.h (also added missing include to SPIRVEnum.h) * lib/SPIRV/libSPIRV/SPIRVFunction.cpp * lib/SPIRV/libSPIRV/SPIRVFunction.h * lib/SPIRV/libSPIRV/SPIRVInstruction.cpp * lib/SPIRV/libSPIRV/SPIRVInstruction.h * lib/SPIRV/libSPIRV/SPIRVModule.cpp * lib/SPIRV/libSPIRV/SPIRVModule.h * lib/SPIRV/libSPIRV/SPIRVStream.cpp * lib/SPIRV/libSPIRV/SPIRVStream.h * lib/SPIRV/libSPIRV/SPIRVType.cpp * lib/SPIRV/libSPIRV/SPIRVUtil.h * lib/SPIRV/libSPIRV/SPIRVValue.cpp * lib/SPIRV/libSPIRV/SPIRVValue.h
Diffstat (limited to 'tools')
-rw-r--r--tools/llvm-spirv/llvm-spirv.cpp73
1 files changed, 34 insertions, 39 deletions
diff --git a/tools/llvm-spirv/llvm-spirv.cpp b/tools/llvm-spirv/llvm-spirv.cpp
index febd46b..003b607 100644
--- a/tools/llvm-spirv/llvm-spirv.cpp
+++ b/tools/llvm-spirv/llvm-spirv.cpp
@@ -56,9 +56,9 @@
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/ToolOutputFile.h"
+#include "llvm/Support/raw_ostream.h"
#ifndef _SPIRV_SUPPORT_TEXT_FMT
#define _SPIRV_SUPPORT_TEXT_FMT
@@ -66,50 +66,50 @@
#include "SPIRV.h"
-#include <memory>
#include <fstream>
#include <iostream>
+#include <memory>
#define DEBUG_TYPE "spirv"
namespace kExt {
- const char SpirvBinary[] = ".spv";
- const char SpirvText[] = ".spt";
- const char LLVMBinary[] = ".bc";
-}
+const char SpirvBinary[] = ".spv";
+const char SpirvText[] = ".spt";
+const char LLVMBinary[] = ".bc";
+} // namespace kExt
using namespace llvm;
-static cl::opt<std::string>
-InputFile(cl::Positional, cl::desc("<input file>"), cl::init("-"));
+static cl::opt<std::string> InputFile(cl::Positional, cl::desc("<input file>"),
+ cl::init("-"));
-static cl::opt<std::string>
-OutputFile("o", cl::desc("Override output filename"),
- cl::value_desc("filename"));
+static cl::opt<std::string> OutputFile("o",
+ cl::desc("Override output filename"),
+ cl::value_desc("filename"));
static cl::opt<bool>
-IsReverse("r", cl::desc("Reverse translation (SPIR-V to LLVM)"));
+ IsReverse("r", cl::desc("Reverse translation (SPIR-V to LLVM)"));
static cl::opt<bool>
-IsRegularization("s", cl::desc(
- "Regularize LLVM to be representable by SPIR-V"));
+ IsRegularization("s",
+ cl::desc("Regularize LLVM to be representable by SPIR-V"));
#ifdef _SPIRV_SUPPORT_TEXT_FMT
namespace SPIRV {
// Use textual format for SPIRV.
extern bool SPIRVUseTextFormat;
-}
+} // namespace SPIRV
static cl::opt<bool>
-ToText("to-text", cl::desc("Convert input SPIR-V binary to internal textual format"));
+ ToText("to-text",
+ cl::desc("Convert input SPIR-V binary to internal textual format"));
-static cl::opt<bool>
-ToBinary("to-binary",
+static cl::opt<bool> ToBinary(
+ "to-binary",
cl::desc("Convert input SPIR-V in internal textual format to binary"));
#endif
-static std::string
-removeExt(const std::string& FileName) {
+static std::string removeExt(const std::string &FileName) {
size_t Pos = FileName.find_last_of(".");
if (Pos != std::string::npos)
return FileName.substr(0, Pos);
@@ -118,8 +118,7 @@ removeExt(const std::string& FileName) {
static ExitOnError ExitOnErr;
-static int
-convertLLVMToSPIRV() {
+static int convertLLVMToSPIRV() {
LLVMContext Context;
std::unique_ptr<MemoryBuffer> MB =
@@ -133,8 +132,9 @@ convertLLVMToSPIRV() {
if (InputFile == "-")
OutputFile = "-";
else
- OutputFile = removeExt(InputFile) +
- (SPIRV::SPIRVUseTextFormat ? kExt::SpirvText : kExt::SpirvBinary);
+ OutputFile =
+ removeExt(InputFile) +
+ (SPIRV::SPIRVUseTextFormat ? kExt::SpirvText : kExt::SpirvBinary);
}
llvm::StringRef outFile(OutputFile);
@@ -148,8 +148,7 @@ convertLLVMToSPIRV() {
return 0;
}
-static int
-convertSPIRVToLLVM() {
+static int convertSPIRVToLLVM() {
LLVMContext Context;
std::ifstream IFS(InputFile, std::ios::binary);
Module *M;
@@ -162,9 +161,8 @@ convertSPIRVToLLVM() {
DEBUG(dbgs() << "Converted LLVM module:\n" << *M);
-
raw_string_ostream ErrorOS(Err);
- if (verifyModule(*M, &ErrorOS)){
+ if (verifyModule(*M, &ErrorOS)) {
errs() << "Fails to verify module: " << ErrorOS.str();
return -1;
}
@@ -190,8 +188,7 @@ convertSPIRVToLLVM() {
}
#ifdef _SPIRV_SUPPORT_TEXT_FMT
-static int
-convertSPIRV() {
+static int convertSPIRV() {
if (ToBinary == ToText) {
errs() << "Invalid arguments\n";
return -1;
@@ -202,14 +199,14 @@ convertSPIRV() {
if (InputFile == "-")
OutputFile = "-";
else {
- OutputFile = removeExt(InputFile)
- + (ToBinary?kExt::SpirvBinary:kExt::SpirvText);
+ OutputFile = removeExt(InputFile) +
+ (ToBinary ? kExt::SpirvBinary : kExt::SpirvText);
}
}
auto Action = [&](llvm::raw_ostream &OFS) {
std::string Err;
- if (!SPIRV::ConvertSPIRV(IFS, OFS, Err, ToBinary, ToText)) {
+ if (!SPIRV::ConvertSPIRV(IFS, OFS, Err, ToBinary, ToText)) {
errs() << "Fails to convert SPIR-V : " << Err << '\n';
return -1;
}
@@ -217,15 +214,15 @@ convertSPIRV() {
};
if (OutputFile != "-") {
std::error_code EC;
- llvm::raw_fd_ostream OFS(llvm::StringRef(OutputFile), EC, llvm::sys::fs::F_None);
+ llvm::raw_fd_ostream OFS(llvm::StringRef(OutputFile), EC,
+ llvm::sys::fs::F_None);
return Action(OFS);
} else
return Action(outs());
}
#endif
-static int
-regularizeLLVM() {
+static int regularizeLLVM() {
LLVMContext Context;
std::unique_ptr<MemoryBuffer> MB =
@@ -260,9 +257,7 @@ regularizeLLVM() {
return 0;
}
-
-int
-main(int ac, char** av) {
+int main(int ac, char **av) {
EnablePrettyStackTrace();
sys::PrintStackTraceOnErrorSignal(av[0]);
PrettyStackTraceProgram X(ac, av);