[COMGR][Cache] Add CachedCommand minimal implementation

This object wraps an llvm::driver::Command into something that can be
cached by Comgr's cache.

co-authored by anjenner and jmmartinez

Change-Id: I0ef7dded51681be2cdb95b1734595b4d08023488

Author: jmmartinez

amd/comgr/CMakeLists.txt

@@ -71,6 +71,7 @@ option(COMGR_BUILD_SHARED_LIBS "Build the shared library"
        ${build_shared_libs_default})
 
 set(SOURCES
+  src/comgr-cache-command.cpp
   src/comgr-compiler.cpp
   src/comgr.cpp
   src/comgr-device-libs.cpp

amd/comgr/src/comgr-cache-command.cpp

@@ -0,0 +1,17 @@
+#include "comgr-cache-command.h"
+
+namespace COMGR {
+using namespace llvm;
+using namespace clang;
+
+CachedCommand::CachedCommand(driver::Command &Command,
+                             DiagnosticOptions &DiagOpts,
+                             llvm::vfs::FileSystem &VFS,
+                             ExecuteFnTy &&ExecuteImpl)
+    : Command(Command), DiagOpts(DiagOpts), VFS(VFS),
+      ExecuteImpl(std::move(ExecuteImpl)) {}
+
+amd_comgr_status_t CachedCommand::execute(llvm::raw_ostream &LogS) {
+  return ExecuteImpl(Command, LogS, DiagOpts, VFS);
+}
+} // namespace COMGR

amd/comgr/src/comgr-cache-command.h

@@ -0,0 +1,89 @@
+/*******************************************************************************
+ *
+ * University of Illinois/NCSA
+ * Open Source License
+ *
+ * Copyright (c) 2018 Advanced Micro Devices, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * with the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimers.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimers in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *     * Neither the names of Advanced Micro Devices, Inc. nor the names of its
+ *       contributors may be used to endorse or promote products derived from
+ *       this Software without specific prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH
+ * THE SOFTWARE.
+ *
+ ******************************************************************************/
+
+#ifndef COMGR_CACHE_COMMAND_H
+#define COMGR_CACHE_COMMAND_H
+
+#include "amd_comgr.h"
+
+#include <clang/Driver/Action.h>
+#include <llvm/Support/Error.h>
+#include <llvm/Support/MemoryBuffer.h>
+#include <llvm/Support/SHA256.h>
+#include <llvm/Support/VirtualFileSystem.h>
+
+namespace clang {
+class DiagnosticOptions;
+namespace driver {
+class Command;
+} // namespace driver
+} // namespace clang
+
+namespace llvm {
+class raw_ostream;
+}
+
+namespace COMGR {
+class CachedCommandAdaptor {
+public:
+  virtual amd_comgr_status_t execute(llvm::raw_ostream &LogS) = 0;
+
+  virtual ~CachedCommandAdaptor() = default;
+};
+
+class CachedCommand final : public CachedCommandAdaptor {
+public:
+  using ExecuteFnTy = std::function<amd_comgr_status_t(
+      clang::driver::Command &, llvm::raw_ostream &, clang::DiagnosticOptions &,
+      llvm::vfs::FileSystem &)>;
+
+private:
+  clang::driver::Command &Command;
+  clang::DiagnosticOptions &DiagOpts;
+  llvm::vfs::FileSystem &VFS;
+  ExecuteFnTy ExecuteImpl;
+
+public:
+  CachedCommand(clang::driver::Command &Command,
+                clang::DiagnosticOptions &DiagOpts, llvm::vfs::FileSystem &VFS,
+                ExecuteFnTy &&ExecuteImpl);
+
+  amd_comgr_status_t execute(llvm::raw_ostream &LogS) override;
+
+  ~CachedCommand() override = default;
+};
+} // namespace COMGR
+
+#endif

amd/comgr/src/comgr-compiler.cpp

@@ -37,6 +37,7 @@
  ******************************************************************************/
 
 #include "comgr-compiler.h"
+#include "comgr-cache-command.h"
 #include "comgr-device-libs.h"
 #include "comgr-diagnostic-handler.h"
 #include "comgr-env.h"
@@ -772,7 +773,8 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) {
   }
 
   for (auto &Job : C->getJobs()) {
-    if (auto Status = executeCommand(Job, LogS, *DiagOpts, *VFS)) {
+    CachedCommand C(Job, *DiagOpts, *VFS, executeCommand);
+    if (auto Status = C.execute(LogS)) {
       return Status;
     }
   }