added output file option

Author: lmarzen

build.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-rm -r build/
+rm -rf build/
 mkdir build
 cd build/
-# cmake .. -DCMAKE_BUILD_TYPE=Release
-cmake .. -DCMAKE_BUILD_TYPE=Debug
+cmake .. -DCMAKE_BUILD_TYPE=Release
+# cmake .. -DCMAKE_BUILD_TYPE=Debug
 make -j
 cd ../

run.sh

@@ -1,8 +1,11 @@
 DIR=$(dirname "$0")
-LIB="$DIR/build/src/rose/librose.so"
-PLUGIN="-rose"
-FILENAME=$1;
+LIB="$DIR/build/src/libompdart.so"
+PLUGIN="ompdart"
+INFILENAME=$1
+OUTFILENAME=$2
 
 set -x
-clang -Xclang -load -Xclang $LIB -Xclang -plugin -Xclang $PLUGIN -fopenmp -c $FILENAME
+# help
+# clang -Xclang -load -Xclang $LIB -Xclang -plugin -Xclang $PLUGIN -Xclang -plugin-arg-$PLUGIN -Xclang --help -fopenmp -c $FILENAME
+clang -Xclang -load -Xclang $LIB -Xclang -plugin -Xclang $PLUGIN -Xclang -plugin-arg-$PLUGIN -Xclang --output -Xclang -plugin-arg-$PLUGIN -Xclang "$OUTFILENAME" -fopenmp -c $INFILENAME
 # gdb --args clang -Xclang -load -Xclang $LIB -Xclang -plugin -Xclang $PLUGIN -fopenmp -c $FILENAME

src/FindDecl.cpp

@@ -4,22 +4,44 @@
 #include "OmpDartASTConsumer.h"
 
 class OmpDartASTAction : public PluginASTAction {
+private:
+  std::string OutFilePath;
 protected:
   std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
                                                  llvm::StringRef) override {
-    return std::make_unique<OmpDartASTConsumer>(&CI);
+    return std::make_unique<OmpDartASTConsumer>(&CI, &OutFilePath);
   }
 
   bool ParseArgs(const CompilerInstance &CI,
                  const std::vector<std::string> &args) override {
+    for (unsigned i = 0, e = args.size(); i != e; ++i) {
+      llvm::errs() << "arg " << i << ": " << args[i] << "\n";
+
+      DiagnosticsEngine &D = CI.getDiagnostics();
+      if (args[i] == "-o" || args[i] == "--output") {
+        if (i + 1 >= e) {
+          D.Report(
+              D.getCustomDiagID(DiagnosticsEngine::Error, "missing argument"));
+          return false;
+        }
+        ++i;
+        // record output preference
+        OutFilePath = args[i];
+      }
+      if (args[i] == "-h" || args[i] == "--help") {
+        PrintHelp(llvm::errs());
+       return false;
+      }
+    }
+
     return true;
   }
-  void PrintHelp(llvm::raw_ostream& ros) {
-    ros << "TODO:: Help goes here\n";
+  void PrintHelp(llvm::raw_ostream &ros) {
+    ros << "TODO help goes here\n";
     return;
   }
 
 }; // end class OmpDartASTAction
 
-static FrontendPluginRegistry::Add<OmpDartASTAction>
-X("-ompdart", "target data analysis");
+static FrontendPluginRegistry::Add<OmpDartASTAction> X("ompdart",
+                                                       "target data analysis");

src/OmpDart.cpp

@@ -2,15 +2,18 @@
 
 #include "AnalysisUtils.h"
 #include "DirectiveRewriter.h"
+#include <string>
 
 using namespace clang;
 
-OmpDartASTConsumer::OmpDartASTConsumer(CompilerInstance *CI)
+OmpDartASTConsumer::OmpDartASTConsumer(CompilerInstance *CI,
+                                       const std::string *OutFilePath)
     : Context(&(CI->getASTContext())), SM(&(Context->getSourceManager())),
       Visitor(new OmpDartASTVisitor(CI)),
       FunctionTrackers(Visitor->getFunctionTrackers()),
       Kernels(Visitor->getTargetRegions()) {
   TheRewriter.setSourceMgr(*SM, Context->getLangOpts());
+  this->OutFilePath = *OutFilePath;
 }
 
 void OmpDartASTConsumer::HandleTranslationUnit(ASTContext &Context) {
@@ -74,15 +77,18 @@ void OmpDartASTConsumer::HandleTranslationUnit(ASTContext &Context) {
   }
 
   FileID FID = SM->getMainFileID();
-  std::string ParsedFilename =
-      SM->getFilename(SM->getLocForStartOfFile(FID)).str();
-  char *CParsedFilename = strdup(ParsedFilename.c_str());
-  char *Basename = basename(CParsedFilename);
+  if (OutFilePath.empty()) {
+    std::string ParsedFilename =
+        SM->getFilename(SM->getLocForStartOfFile(FID)).str();
+    char *CParsedFilename = strdup(ParsedFilename.c_str());
+    char *Basename = basename(CParsedFilename);
 
-  std::string Filename = "/tmp/" + std::string(Basename);
-  llvm::outs() << "Modified File at " << Filename << "\n";
+    OutFilePath = "/tmp/" + std::string(Basename);
+    free(CParsedFilename);
+  }
+  llvm::outs() << "Modified File at " << OutFilePath << "\n";
   std::error_code ErrorCode;
-  llvm::raw_fd_ostream OutFile(Filename, ErrorCode, llvm::sys::fs::OF_None);
+  llvm::raw_fd_ostream OutFile(OutFilePath, ErrorCode, llvm::sys::fs::OF_None);
   if (!ErrorCode) {
     // print to terminal
     // TheRewriter.getEditBuffer(SM.getMainFileID()).write(llvm::outs());
@@ -92,5 +98,4 @@ void OmpDartASTConsumer::HandleTranslationUnit(ASTContext &Context) {
     llvm::outs() << "Could not create file\n";
   }
   OutFile.close();
-  free(CParsedFilename);
 }

src/OmpDartASTConsumer.cpp

@@ -12,13 +12,15 @@ class OmpDartASTConsumer : public ASTConsumer {
   SourceManager *SM;
   OmpDartASTVisitor *Visitor;
   Rewriter TheRewriter;
+  std::string OutFilePath;
 
   std::vector<DataTracker *> &FunctionTrackers;
   std::vector<Kernel *> &Kernels;
 
 public:
-  explicit OmpDartASTConsumer(CompilerInstance *CI);
-  
+  explicit OmpDartASTConsumer(CompilerInstance *CI,
+                              const std::string *OutFilePath);
+
   virtual void HandleTranslationUnit(ASTContext &Context);
 
 }; // end class OmpDartASTConsumer