Add CallExpr and basic ConditionalOperator support

fix

fix

include/clad/Differentiator/DiffPlanner.h

@@ -7,8 +7,6 @@
 #include "clad/Differentiator/DynamicGraph.h"
 #include "clad/Differentiator/ParseDiffArgsTypes.h"
 
-#include <iterator>
-#include <set>
 namespace clang {
 class CallExpr;
 class CompilerInstance;
@@ -35,7 +33,7 @@ struct DiffRequest {
 
   mutable struct ActivityRunInfo {
     std::set<const clang::VarDecl*> ToBeRecorded;
-    bool HasAnalysisRun = false;
+    bool HasNoAnalysisRun = true;
   } m_ActivityRunInfo;
 
 public:

lib/Differentiator/ActivityAnalyzer.cpp

@@ -10,8 +10,6 @@ void VariedAnalyzer::Analyze(const FunctionDecl* FD) {
   m_CFG = clang::CFG::buildCFG(FD, FD->getBody(), &m_Context, Options);
 
   m_BlockData.resize(m_CFG->size());
-  m_BlockPassCounter.resize(m_CFG->size(), 0);
-
   // Set current block ID to the ID of entry the block.
   CFGBlock* entry = &m_CFG->getEntry();
   m_CurBlockID = entry->getBlockID();
@@ -27,15 +25,15 @@ void VariedAnalyzer::Analyze(const FunctionDecl* FD) {
     m_CurBlockID = *IDIter;
     m_CFGQueue.erase(IDIter);
     CFGBlock& nextBlock = *getCFGBlockByID(m_CurBlockID);
-    VisitCFGBlock(nextBlock);
+    AnalyzeCFGBlock(nextBlock);
   }
 }
 
 CFGBlock* VariedAnalyzer::getCFGBlockByID(unsigned ID) {
   return *(m_CFG->begin() + ID);
 }
 
-void VariedAnalyzer::VisitCFGBlock(const CFGBlock& block) {
+void VariedAnalyzer::AnalyzeCFGBlock(const CFGBlock& block) {
   // Visit all the statements inside the block.
   for (const clang::CFGElement& Element : block) {
     if (Element.getKind() == clang::CFGElement::Statement) {
@@ -166,4 +164,4 @@ bool VariedAnalyzer::VisitDeclRefExpr(DeclRefExpr* DRE) {
   }
   return true;
 }
-} // namespace clad
+} // namespace clad

lib/Differentiator/ActivityAnalyzer.h

@@ -8,13 +8,20 @@
 #include "clad/Differentiator/Compatibility.h"
 
 #include <algorithm>
+#include <utility>
 #include <iterator>
+#include <memory>
 #include <set>
 #include <unordered_map>
 #include <utility>
 
 using namespace clang;
 
+/// @brief Class that implemets Varied part of the Activity analysis.
+/// By performing static data-flow analysis, so called Varied variables 
+/// are determined, meaning variables that depend on input parameters 
+/// in a differentiable way. That result enables us to remove redundant 
+/// statements in the reverse mode, improving generated codes efficiency.
 namespace clad {
 class VariedAnalyzer : public clang::RecursiveASTVisitor<VariedAnalyzer> {
 
@@ -27,26 +34,36 @@ class VariedAnalyzer : public clang::RecursiveASTVisitor<VariedAnalyzer> {
     return std::unique_ptr<VarsData>(new VarsData(std::move(toAssign)));
   }
 
+  using VarsData = std::set<const clang::VarDecl*>;
+  /// @brief A helper method to allocate VarsData
+  /// @param toAssign Parameter to initialize new VarsData with.
+  /// @return Unique pointer to a new object of type Varsdata.
+  static std::unique_ptr<VarsData> createNewVarsData(VarsData toAssign) {
+    return std::make_unique<VarsData>(std::move(toAssign));
+  }
   VarsData m_LoopMem;
+
   clang::CFGBlock* getCFGBlockByID(unsigned ID);
 
   static void merge(VarsData* targetData, VarsData* mergeData);
   ASTContext& m_Context;
+  static void merge(VarsData* targetData, VarsData* mergeData);
+  clang::ASTContext& m_Context;
   std::unique_ptr<clang::CFG> m_CFG;
   std::vector<std::unique_ptr<VarsData>> m_BlockData;
   std::vector<short> m_BlockPassCounter;
+  std::vector<std::unique_ptr<VarsData>> m_BlockData;
   unsigned m_CurBlockID{};
   std::set<unsigned> m_CFGQueue;
-
-  void addToVaried(const clang::VarDecl* VD);
-  bool isVaried(const clang::VarDecl* VD);
-
+  bool isVaried(const clang::VarDecl* VD) const;
   void copyVarToCurBlock(const clang::VarDecl* VD);
   VarsData& getCurBlockVarsData() { return *m_BlockData[m_CurBlockID]; }
+  const VarsData& getCurBlockVarsData() const { return const_cast<VariedAnalyzer*>(this)->getCurBlockVarsData();}
+  void AnalyzeCFGBlock(const clang::CFGBlock& block);
 
 public:
   /// Constructor
-  VariedAnalyzer(ASTContext& Context, std::set<const clang::VarDecl*>& Decls)
+  VariedAnalyzer(clang::ASTContext& Context, std::set<const clang::VarDecl*>& Decls)
       : m_VariedDecls(Decls), m_Context(Context) {}
 
   /// Destructor
@@ -58,7 +75,8 @@ class VariedAnalyzer : public clang::RecursiveASTVisitor<VariedAnalyzer> {
   VariedAnalyzer(const VariedAnalyzer&&) = delete;
   VariedAnalyzer& operator=(const VariedAnalyzer&&) = delete;
 
-  /// Visitors
+  /// @brief Runs Varied analysis.
+  /// @param FD Function to run the analysis on.
   void Analyze(const clang::FunctionDecl* FD);
   void VisitCFGBlock(const clang::CFGBlock& block);
   bool VisitBinaryOperator(clang::BinaryOperator* BinOp);
@@ -69,4 +87,4 @@ class VariedAnalyzer : public clang::RecursiveASTVisitor<VariedAnalyzer> {
   bool VisitUnaryOperator(clang::UnaryOperator* UnOp);
 };
 } // namespace clad
-#endif // CLAD_DIFFERENTIATOR_ACTIVITYANALYZER_H
+#endif // CLAD_DIFFERENTIATOR_ACTIVITYANALYZER_H

lib/Differentiator/CMakeLists.txt

@@ -21,6 +21,7 @@ set_property(SOURCE Version.cpp APPEND PROPERTY
 # (Ab)use llvm facilities for adding libraries.
 llvm_add_library(cladDifferentiator
   STATIC
+  ActivityAnalyzer.cpp
   BaseForwardModeVisitor.cpp
   CladUtils.cpp
   ConstantFolder.cpp
@@ -36,7 +37,6 @@ llvm_add_library(cladDifferentiator
   ReverseModeForwPassVisitor.cpp
   ReverseModeVisitor.cpp
   TBRAnalyzer.cpp
-  ActivityAnalyzer.cpp
   StmtClone.cpp
   VectorForwardModeVisitor.cpp
   VectorPushForwardModeVisitor.cpp

lib/Differentiator/DiffPlanner.cpp

@@ -616,14 +616,15 @@ namespace clad {
     return found != m_TbrRunInfo.ToBeRecorded.end();
   }
 
+  bool DiffRequest::shouldHaveAdjoint(const VarDecl* VD) const {
   bool DiffRequest::shouldHaveAdjoint(const VarDecl* VD) const {
     if (!EnableActivityAnalysis)
       return true;
 
     if (VD->getType()->isPointerType())
       return true;
 
-    if (!m_ActivityRunInfo.HasAnalysisRun) {
+    if (m_ActivityRunInfo.HasNoAnalysisRun) {
       if (!DVI.empty()) {
         for (const auto& dParam : DVI)
           m_ActivityRunInfo.ToBeRecorded.insert(cast<VarDecl>(dParam.param));
@@ -636,7 +637,7 @@ namespace clad {
       VariedAnalyzer analyzer(Function->getASTContext(),
                               m_ActivityRunInfo.ToBeRecorded);
       analyzer.Analyze(Function);
-      m_ActivityRunInfo.HasAnalysisRun = true;
+      m_ActivityRunInfo.HasNoAnalysisRun = true;
     }
     auto found = m_ActivityRunInfo.ToBeRecorded.find(VD);
     return found != m_ActivityRunInfo.ToBeRecorded.end();