Remove indirection for input args

AdaptorCM has four classes related to translation input arguments.
Remove extra layers of indirection for input arguments.
Removed fields were not used anyway.

Change-Id: Ic514cc355dd93116d0b46dc09ca4089c9591ccde

Author: aus-intel

IGC/AdaptorOCL/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.cpp

@@ -50,7 +50,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <vector>
 
 #if !defined(WDDM_LINUX) && (!defined(IGC_VC_DISABLED) || !IGC_VC_DISABLED)
-#include "CMFE/AdaptorCM/cm_args.h"
+#include "CMFE/AdaptorCM/Frontend.h"
 #endif // !defined(WDDM_LINUX) && (!defined(IGC_VC_DISABLED) || !IGC_VC_DISABLED)
 
 #include "cif/macros/enable.h"
@@ -146,17 +146,14 @@ void runFeInvocation(const InvocationInfo& Invocation,
         return;
     }
 
-    IGC::CM::FeInputArgsImpl InputArgs;
+    IGC::AdaptorCM::Frontend::InputArgs InputArgs;
     InputArgs.InputText = InputText;
     InputArgs.CompilationOpts = Invocation.getFEArgs();
-    (void)InputArgs.ExtraFiles; // !!! extra files are not used at the moment
-    // InputArgs.SupportDirs = SupportDirs;
-    InputArgs.OutputFormat = IGC::AdaptorCM::Frontend::IInputArgs::FormatT::SPIR_V_BC;
 
     using FEOutput = IGC::AdaptorCM::Frontend::IOutputArgs;
     auto FeDeleter = [](FEOutput* out) { out->discard(); };
     std::unique_ptr<FEOutput, decltype(FeDeleter)> Res(
-            IGC::AdaptorCM::Frontend::translate(&InputArgs),
+            IGC::AdaptorCM::Frontend::translate(InputArgs),
             FeDeleter);
 
     if (!Res) {

IGC/CMFE/AdaptorCM/Frontend.cpp

@@ -9,7 +9,6 @@
 #include <sstream>
 
 #include "Frontend.h"
-#include "InputArgsWrapper.h"
 
 #if defined(__linux__)
 #include <dlfcn.h>
@@ -91,12 +90,7 @@ IGC::AdaptorCM::Frontend::getDriverInvocation(int argc, const char * argv[]) {
   return BuildCommandLine(argc, argv);
 }
 
-IOutputArgs *IGC::AdaptorCM::Frontend::translate(const IInputArgs *Input) {
-
-  if (!Input) {
-    llvm::report_fatal_error("empty input passed to AdaptorCM::Translate", false);
-  }
-
+IOutputArgs *IGC::AdaptorCM::Frontend::translate(const InputArgs &Input) {
   auto DL = getFELibrary();
 
   auto Compile = reinterpret_cast<decltype(&IntelCMClangFECompile)>(
@@ -106,13 +100,7 @@ IOutputArgs *IGC::AdaptorCM::Frontend::translate(const IInputArgs *Input) {
       "haven't found IntelCMClangFECompile function in the dynamic library", false);
   }
 
-  InputArgsWrapper::ErrorType Error;
-  InputArgsWrapper WrappedInput(*Input, Error);
-  if (!Error.empty()) {
-    llvm::report_fatal_error(Error, false);
-  }
-
-  return Compile(&WrappedInput);
+  return Compile(&Input);
 }
 
 using StringVect_t = IGC::AdaptorCM::Frontend::StringVect_t;

IGC/CMFE/AdaptorCM/Frontend.h

@@ -7,19 +7,14 @@ namespace IGC {
 namespace AdaptorCM {
 namespace Frontend {
 
-struct IInputArgs {
-  using StrT = Intel::CM::ClangFE::IInputArgs::StrT;
-  template <typename T> using SeqT = Intel::CM::ClangFE::IInputArgs::SeqT<T>;
-  // output formats
-  enum class FormatT { LLVM_IR, LLVM_IR_BC, SPIR_V_BC, PREPROC };
-
-  virtual const StrT &getSrc() const = 0;
-  virtual const SeqT<StrT> &getCompOpts() const = 0;
-  virtual const SeqT<StrT> &getExtraFiles() const = 0;
-  virtual const SeqT<StrT> &getSupportDirs() const = 0;
-
-  virtual FormatT getOutputFormat() const = 0;
-  virtual ~IInputArgs() {}
+struct InputArgs final : public Intel::CM::ClangFE::IInputArgs {
+  StrT InputText;
+  SeqT<StrT> CompilationOpts;
+  SeqT<FileT<StrT>> ExtraFiles;
+
+  const StrT &getSrc() const override { return InputText; }
+  const SeqT<StrT> &getCompOpts() const override { return CompilationOpts; }
+  const SeqT<FileT<StrT>> &getExtraFiles() const override { return ExtraFiles; }
 };
 
 using StringVect_t = std::vector<std::string>;
@@ -34,7 +29,7 @@ struct AbiCompatibilityInfo {
 };
 bool validateABICompatibility(AbiCompatibilityInfo *AbiInfo = nullptr);
 
-IOutputArgs *translate(const IInputArgs *);
+IOutputArgs *translate(const InputArgs &);
 
 IDriverInvocation *getDriverInvocation(int argc, const char * argv[]);