Răsfoiți Sursa

[spirv] Consistent upper and lower case file names.

We were using "SPIRV" in some file names, and we were using
"Spirv" in other file names. To make everything consistent, I have
switched everything to the latter.
Ehsan Nasiri 6 ani în urmă
părinte
comite
13f3baf9e0

+ 3 - 3
tools/clang/include/clang/SPIRV/EmitSPIRVAction.h → tools/clang/include/clang/SPIRV/EmitSpirvAction.h

@@ -1,4 +1,4 @@
-//===-- EmitSPIRVAction.h - FrontendAction for Emitting SPIR-V --*- C++ -*-===//
+//===-- EmitSpirvAction.h - FrontendAction for Emitting SPIR-V --*- C++ -*-===//
 //
 //
 //                     The LLVM Compiler Infrastructure
 //                     The LLVM Compiler Infrastructure
 //
 //
@@ -13,9 +13,9 @@
 
 
 namespace clang {
 namespace clang {
 
 
-class EmitSPIRVAction : public ASTFrontendAction {
+class EmitSpirvAction : public ASTFrontendAction {
 public:
 public:
-  EmitSPIRVAction() {}
+  EmitSpirvAction() {}
 
 
 protected:
 protected:
   std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
   std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,

+ 1 - 1
tools/clang/include/clang/SPIRV/SpirvBuilder.h

@@ -10,7 +10,7 @@
 #define LLVM_CLANG_SPIRV_SPIRVBUILDER_H
 #define LLVM_CLANG_SPIRV_SPIRVBUILDER_H
 
 
 #include "clang/SPIRV/FeatureManager.h"
 #include "clang/SPIRV/FeatureManager.h"
-#include "clang/SPIRV/SPIRVContext.h"
+#include "clang/SPIRV/SpirvContext.h"
 #include "clang/SPIRV/SpirvBasicBlock.h"
 #include "clang/SPIRV/SpirvBasicBlock.h"
 #include "clang/SPIRV/SpirvFunction.h"
 #include "clang/SPIRV/SpirvFunction.h"
 #include "clang/SPIRV/SpirvInstruction.h"
 #include "clang/SPIRV/SpirvInstruction.h"

+ 1 - 1
tools/clang/include/clang/SPIRV/SPIRVContext.h → tools/clang/include/clang/SPIRV/SpirvContext.h

@@ -1,4 +1,4 @@
-//===-- SPIRVContext.h - Context holding SPIR-V codegen data ----*- C++ -*-===//
+//===-- SpirvContext.h - Context holding SPIR-V codegen data ----*- C++ -*-===//
 //
 //
 //                     The LLVM Compiler Infrastructure
 //                     The LLVM Compiler Infrastructure
 //
 //

+ 4 - 4
tools/clang/lib/SPIRV/CMakeLists.txt

@@ -8,19 +8,19 @@ add_clang_library(clangSPIRV
   BlockReadableOrder.cpp
   BlockReadableOrder.cpp
   CapabilityVisitor.cpp
   CapabilityVisitor.cpp
   DeclResultIdMapper.cpp
   DeclResultIdMapper.cpp
-  EmitSPIRVAction.cpp
+  EmitSpirvAction.cpp
   EmitVisitor.cpp
   EmitVisitor.cpp
   FeatureManager.cpp
   FeatureManager.cpp
   GlPerVertex.cpp
   GlPerVertex.cpp
   InitListHandler.cpp
   InitListHandler.cpp
   LiteralTypeVisitor.cpp
   LiteralTypeVisitor.cpp
   LowerTypeVisitor.cpp
   LowerTypeVisitor.cpp
-  SPIRVContext.cpp
-  SPIRVEmitter.cpp
   SpirvBasicBlock.cpp
   SpirvBasicBlock.cpp
   SpirvBuilder.cpp
   SpirvBuilder.cpp
-  SpirvInstruction.cpp
+  SpirvContext.cpp
+  SpirvEmitter.cpp
   SpirvFunction.cpp
   SpirvFunction.cpp
+  SpirvInstruction.cpp
   SpirvModule.cpp
   SpirvModule.cpp
   SpirvType.cpp
   SpirvType.cpp
   String.cpp
   String.cpp

+ 1 - 1
tools/clang/lib/SPIRV/CapabilityVisitor.h

@@ -10,7 +10,7 @@
 #ifndef LLVM_CLANG_LIB_SPIRV_CAPABILITYVISITOR_H
 #ifndef LLVM_CLANG_LIB_SPIRV_CAPABILITYVISITOR_H
 #define LLVM_CLANG_LIB_SPIRV_CAPABILITYVISITOR_H
 #define LLVM_CLANG_LIB_SPIRV_CAPABILITYVISITOR_H
 
 
-#include "clang/SPIRV/SPIRVContext.h"
+#include "clang/SPIRV/SpirvContext.h"
 #include "clang/SPIRV/SpirvVisitor.h"
 #include "clang/SPIRV/SpirvVisitor.h"
 
 
 namespace clang {
 namespace clang {

+ 1 - 1
tools/clang/lib/SPIRV/DeclResultIdMapper.cpp

@@ -24,7 +24,7 @@
 #include "llvm/ADT/StringSet.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Casting.h"
 
 
-#include "SPIRVEmitter.h"
+#include "SpirvEmitter.h"
 
 
 namespace clang {
 namespace clang {
 namespace spirv {
 namespace spirv {

+ 4 - 4
tools/clang/lib/SPIRV/DeclResultIdMapper.h

@@ -31,7 +31,7 @@
 namespace clang {
 namespace clang {
 namespace spirv {
 namespace spirv {
 
 
-class SPIRVEmitter;
+class SpirvEmitter;
 
 
 /// A struct containing information about a particular HLSL semantic.
 /// A struct containing information about a particular HLSL semantic.
 struct SemanticInfo {
 struct SemanticInfo {
@@ -261,7 +261,7 @@ class DeclResultIdMapper {
 public:
 public:
   inline DeclResultIdMapper(const hlsl::ShaderModel &stage, ASTContext &context,
   inline DeclResultIdMapper(const hlsl::ShaderModel &stage, ASTContext &context,
                             SpirvContext &spirvContext,
                             SpirvContext &spirvContext,
-                            SpirvBuilder &spirvBuilder, SPIRVEmitter &emitter,
+                            SpirvBuilder &spirvBuilder, SpirvEmitter &emitter,
                             FeatureManager &features,
                             FeatureManager &features,
                             const SpirvCodeGenOptions &spirvOptions);
                             const SpirvCodeGenOptions &spirvOptions);
 
 
@@ -632,7 +632,7 @@ private:
 private:
 private:
   const hlsl::ShaderModel &shaderModel;
   const hlsl::ShaderModel &shaderModel;
   SpirvBuilder &spvBuilder;
   SpirvBuilder &spvBuilder;
-  SPIRVEmitter &theEmitter;
+  SpirvEmitter &theEmitter;
   const SpirvCodeGenOptions &spirvOptions;
   const SpirvCodeGenOptions &spirvOptions;
   ASTContext &astContext;
   ASTContext &astContext;
   SpirvContext &spvContext;
   SpirvContext &spvContext;
@@ -749,7 +749,7 @@ DeclResultIdMapper::DeclResultIdMapper(const hlsl::ShaderModel &model,
                                        ASTContext &context,
                                        ASTContext &context,
                                        SpirvContext &spirvContext,
                                        SpirvContext &spirvContext,
                                        SpirvBuilder &spirvBuilder,
                                        SpirvBuilder &spirvBuilder,
-                                       SPIRVEmitter &emitter,
+                                       SpirvEmitter &emitter,
                                        FeatureManager &features,
                                        FeatureManager &features,
                                        const SpirvCodeGenOptions &options)
                                        const SpirvCodeGenOptions &options)
     : shaderModel(model), spvBuilder(spirvBuilder), theEmitter(emitter),
     : shaderModel(model), spvBuilder(spirvBuilder), theEmitter(emitter),

+ 5 - 5
tools/clang/lib/SPIRV/EmitSPIRVAction.cpp → tools/clang/lib/SPIRV/EmitSpirvAction.cpp

@@ -1,4 +1,4 @@
-//===--- EmitSPIRVAction.cpp - EmitSPIRVAction implementation -------------===//
+//===--- EmitSpirvAction.cpp - EmitSPIRVAction implementation -------------===//
 //
 //
 //                     The LLVM Compiler Infrastructure
 //                     The LLVM Compiler Infrastructure
 //
 //
@@ -7,9 +7,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
 //===----------------------------------------------------------------------===//
 
 
-#include "clang/SPIRV/EmitSPIRVAction.h"
+#include "clang/SPIRV/EmitSpirvAction.h"
 
 
-#include "SPIRVEmitter.h"
+#include "SpirvEmitter.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/STLExtras.h"
@@ -17,7 +17,7 @@
 namespace clang {
 namespace clang {
 
 
 std::unique_ptr<ASTConsumer>
 std::unique_ptr<ASTConsumer>
-EmitSPIRVAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) {
-  return llvm::make_unique<spirv::SPIRVEmitter>(CI);
+EmitSpirvAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) {
+  return llvm::make_unique<spirv::SpirvEmitter>(CI);
 }
 }
 } // end namespace clang
 } // end namespace clang

+ 1 - 1
tools/clang/lib/SPIRV/EmitVisitor.h

@@ -8,7 +8,7 @@
 #ifndef LLVM_CLANG_SPIRV_EMITVISITOR_H
 #ifndef LLVM_CLANG_SPIRV_EMITVISITOR_H
 #define LLVM_CLANG_SPIRV_EMITVISITOR_H
 #define LLVM_CLANG_SPIRV_EMITVISITOR_H
 
 
-#include "clang/SPIRV/SPIRVContext.h"
+#include "clang/SPIRV/SpirvContext.h"
 #include "clang/SPIRV/SpirvVisitor.h"
 #include "clang/SPIRV/SpirvVisitor.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseMap.h"
 
 

+ 2 - 2
tools/clang/lib/SPIRV/InitListHandler.cpp

@@ -22,7 +22,7 @@
 namespace clang {
 namespace clang {
 namespace spirv {
 namespace spirv {
 
 
-InitListHandler::InitListHandler(const ASTContext &ctx, SPIRVEmitter &emitter)
+InitListHandler::InitListHandler(const ASTContext &ctx, SpirvEmitter &emitter)
     : astContext(ctx), theEmitter(emitter),
     : astContext(ctx), theEmitter(emitter),
       spvBuilder(emitter.getSpirvBuilder()),
       spvBuilder(emitter.getSpirvBuilder()),
       diags(emitter.getDiagnosticsEngine()) {}
       diags(emitter.getDiagnosticsEngine()) {}
@@ -283,7 +283,7 @@ InitListHandler::createInitForVectorType(QualType elemType, uint32_t count,
       /// HLSL vector types are parameterized templates and we cannot
       /// HLSL vector types are parameterized templates and we cannot
       /// construct them. So we construct an ExtVectorType here instead.
       /// construct them. So we construct an ExtVectorType here instead.
       /// This is unfortunate since it means we need to handle ExtVectorType
       /// This is unfortunate since it means we need to handle ExtVectorType
-      /// in all type casting methods in SPIRVEmitter.
+      /// in all type casting methods in SpirvEmitter.
       const auto toVecType =
       const auto toVecType =
           theEmitter.getASTContext().getExtVectorType(elemType, count);
           theEmitter.getASTContext().getExtVectorType(elemType, count);
       return theEmitter.castToType(theEmitter.loadIfGLValue(init),
       return theEmitter.castToType(theEmitter.loadIfGLValue(init),

+ 4 - 4
tools/clang/lib/SPIRV/InitListHandler.h

@@ -21,7 +21,7 @@
 #include "clang/AST/Expr.h"
 #include "clang/AST/Expr.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/Diagnostic.h"
 
 
-#include "SPIRVEmitter.h"
+#include "SpirvEmitter.h"
 
 
 namespace clang {
 namespace clang {
 namespace spirv {
 namespace spirv {
@@ -43,7 +43,7 @@ namespace spirv {
 ///
 ///
 /// Resulting from the above reasons, the logic for handling initalizer lists
 /// Resulting from the above reasons, the logic for handling initalizer lists
 /// are complicated. So we have this dedicated class for it. It is built on
 /// are complicated. So we have this dedicated class for it. It is built on
-/// top of the SPIRVEmitter class and calls into SPIRVEmitter for normal
+/// top of the SpirvEmitter class and calls into SPIRVEmitter for normal
 /// translation tasks. This gives better code structure.
 /// translation tasks. This gives better code structure.
 ///
 ///
 /// The logic for handling initalizer lists is largely the following:
 /// The logic for handling initalizer lists is largely the following:
@@ -79,7 +79,7 @@ public:
   /// Constructs an InitListHandler which uses the given emitter for normal
   /// Constructs an InitListHandler which uses the given emitter for normal
   /// translation tasks. It will reuse the ModuleBuilder embedded in the given
   /// translation tasks. It will reuse the ModuleBuilder embedded in the given
   /// emitter.
   /// emitter.
-  explicit InitListHandler(const ASTContext &, SPIRVEmitter &);
+  explicit InitListHandler(const ASTContext &, SpirvEmitter &);
 
 
   /// Processes the given InitListExpr and returns the <result-id> for the final
   /// Processes the given InitListExpr and returns the <result-id> for the final
   /// SPIR-V value.
   /// SPIR-V value.
@@ -137,7 +137,7 @@ private:
 
 
 private:
 private:
   const ASTContext &astContext;
   const ASTContext &astContext;
-  SPIRVEmitter &theEmitter;
+  SpirvEmitter &theEmitter;
   SpirvBuilder &spvBuilder;
   SpirvBuilder &spvBuilder;
   DiagnosticsEngine &diags;
   DiagnosticsEngine &diags;
 
 

+ 1 - 1
tools/clang/lib/SPIRV/LiteralTypeVisitor.h

@@ -10,7 +10,7 @@
 #ifndef LLVM_CLANG_LIB_SPIRV_LITERALTYPEVISITOR_H
 #ifndef LLVM_CLANG_LIB_SPIRV_LITERALTYPEVISITOR_H
 #define LLVM_CLANG_LIB_SPIRV_LITERALTYPEVISITOR_H
 #define LLVM_CLANG_LIB_SPIRV_LITERALTYPEVISITOR_H
 
 
-#include "clang/SPIRV/SPIRVContext.h"
+#include "clang/SPIRV/SpirvContext.h"
 #include "clang/SPIRV/SpirvVisitor.h"
 #include "clang/SPIRV/SpirvVisitor.h"
 
 
 namespace clang {
 namespace clang {

+ 1 - 1
tools/clang/lib/SPIRV/LowerTypeVisitor.h

@@ -12,7 +12,7 @@
 
 
 #include "AlignmentSizeCalculator.h"
 #include "AlignmentSizeCalculator.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/SPIRV/SPIRVContext.h"
+#include "clang/SPIRV/SpirvContext.h"
 #include "clang/SPIRV/SpirvVisitor.h"
 #include "clang/SPIRV/SpirvVisitor.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/Optional.h"
 
 

+ 1 - 1
tools/clang/lib/SPIRV/SPIRVContext.cpp → tools/clang/lib/SPIRV/SpirvContext.cpp

@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <algorithm>
 #include <tuple>
 #include <tuple>
 
 
-#include "clang/SPIRV/SPIRVContext.h"
+#include "clang/SPIRV/SpirvContext.h"
 
 
 namespace clang {
 namespace clang {
 namespace spirv {
 namespace spirv {

Fișier diff suprimat deoarece este prea mare
+ 112 - 112
tools/clang/lib/SPIRV/SpirvEmitter.cpp


+ 5 - 5
tools/clang/lib/SPIRV/SPIRVEmitter.h → tools/clang/lib/SPIRV/SpirvEmitter.h

@@ -1,4 +1,4 @@
-//===------- SPIRVEmitter.h - SPIR-V Binary Code Emitter --------*- C++ -*-===//
+//===------- SpirvEmitter.h - SPIR-V Binary Code Emitter --------*- C++ -*-===//
 //
 //
 //                     The LLVM Compiler Infrastructure
 //                     The LLVM Compiler Infrastructure
 //
 //
@@ -28,7 +28,7 @@
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/SPIRV/FeatureManager.h"
 #include "clang/SPIRV/FeatureManager.h"
-#include "clang/SPIRV/SPIRVContext.h"
+#include "clang/SPIRV/SpirvContext.h"
 #include "clang/SPIRV/SpirvBuilder.h"
 #include "clang/SPIRV/SpirvBuilder.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SetVector.h"
@@ -43,9 +43,9 @@ namespace spirv {
 ///
 ///
 /// This class only overrides the HandleTranslationUnit() method; Traversing
 /// This class only overrides the HandleTranslationUnit() method; Traversing
 /// through the AST is done manually instead of using ASTConsumer's harness.
 /// through the AST is done manually instead of using ASTConsumer's harness.
-class SPIRVEmitter : public ASTConsumer {
+class SpirvEmitter : public ASTConsumer {
 public:
 public:
-  SPIRVEmitter(CompilerInstance &ci);
+  SpirvEmitter(CompilerInstance &ci);
 
 
   void HandleTranslationUnit(ASTContext &context) override;
   void HandleTranslationUnit(ASTContext &context) override;
 
 
@@ -1054,7 +1054,7 @@ private:
   SpirvString *mainSourceFile;
   SpirvString *mainSourceFile;
 };
 };
 
 
-void SPIRVEmitter::doDeclStmt(const DeclStmt *declStmt) {
+void SpirvEmitter::doDeclStmt(const DeclStmt *declStmt) {
   for (auto *decl : declStmt->decls())
   for (auto *decl : declStmt->decls())
     doDecl(decl);
     doDecl(decl);
 }
 }

+ 1 - 1
tools/clang/tools/dxcompiler/dxcompilerobj.cpp

@@ -534,7 +534,7 @@ public:
             opts.SpirvOptions.clOptions += " " + std::string(opt);
             opts.SpirvOptions.clOptions += " " + std::string(opt);
 
 
         compiler.getCodeGenOpts().SpirvOptions = opts.SpirvOptions;
         compiler.getCodeGenOpts().SpirvOptions = opts.SpirvOptions;
-        clang::EmitSPIRVAction action;
+        clang::EmitSpirvAction action;
         FrontendInputFile file(utf8SourceName.m_psz, IK_HLSL);
         FrontendInputFile file(utf8SourceName.m_psz, IK_HLSL);
         action.BeginSourceFile(compiler, file);
         action.BeginSourceFile(compiler, file);
         action.Execute();
         action.Execute();

+ 1 - 1
tools/clang/unittests/SPIRV/SPIRVContextTest.cpp

@@ -7,7 +7,7 @@
 //
 //
 //===----------------------------------------------------------------------===//
 //===----------------------------------------------------------------------===//
 
 
-#include "clang/SPIRV/SPIRVContext.h"
+#include "clang/SPIRV/SpirvContext.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Type.h"
 #include "clang/AST/Type.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/TargetInfo.h"

+ 1 - 1
tools/clang/unittests/SPIRV/SpirvConstantTest.cpp

@@ -10,7 +10,7 @@
 #include "gmock/gmock.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "gtest/gtest.h"
 
 
-#include "clang/SPIRV/SPIRVContext.h"
+#include "clang/SPIRV/SpirvContext.h"
 #include "clang/SPIRV/SpirvInstruction.h"
 #include "clang/SPIRV/SpirvInstruction.h"
 
 
 namespace {
 namespace {

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff