Minor changes to address comments

Author: svkeerthy

llvm/include/llvm/Analysis/IR2Vec.h

@@ -155,22 +155,7 @@ class SymbolicEmbedder : public Embedder {
 
 } // namespace ir2vec
 
-class IR2VecVocabResult;
-
-/// This analysis provides the vocabulary for IR2Vec. The vocabulary provides a
-/// mapping between an entity of the IR (like opcode, type, argument, etc.) and
-/// its corresponding embedding.
-class IR2VecVocabAnalysis : public AnalysisInfoMixin<IR2VecVocabAnalysis> {
-  ir2vec::Vocab Vocabulary;
-  Error readVocabulary();
-
-public:
-  static AnalysisKey Key;
-  IR2VecVocabAnalysis() = default;
-  using Result = IR2VecVocabResult;
-  Result run(Module &M, ModuleAnalysisManager &MAM);
-};
-
+/// Class for storing the result of the IR2VecVocabAnalysis.
 class IR2VecVocabResult {
   ir2vec::Vocab Vocabulary;
   bool Valid = false;
@@ -186,6 +171,20 @@ class IR2VecVocabResult {
                   ModuleAnalysisManager::Invalidator &Inv);
 };
 
+/// This analysis provides the vocabulary for IR2Vec. The vocabulary provides a
+/// mapping between an entity of the IR (like opcode, type, argument, etc.) and
+/// its corresponding embedding.
+class IR2VecVocabAnalysis : public AnalysisInfoMixin<IR2VecVocabAnalysis> {
+  ir2vec::Vocab Vocabulary;
+  Error readVocabulary();
+
+public:
+  static AnalysisKey Key;
+  IR2VecVocabAnalysis() = default;
+  using Result = IR2VecVocabResult;
+  Result run(Module &M, ModuleAnalysisManager &MAM);
+};
+
 /// This pass prints the IR2Vec embeddings for instructions, basic blocks, and
 /// functions.
 class IR2VecPrinterPass : public PassInfoMixin<IR2VecPrinterPass> {

llvm/lib/Analysis/IR2Vec.cpp

@@ -134,7 +134,7 @@ Embedding SymbolicEmbedder::getOperandEmbedding(const Value *Op) {
 void SymbolicEmbedder::computeEmbeddings() {
   if (F.isDeclaration())
     return;
-  for (auto &BB : F) {
+  for (const auto &BB : F) {
     auto [It, WasInserted] = BBVecMap.try_emplace(&BB, computeBB2Vec(BB));
     assert(WasInserted && "Basic block already exists in the map");
     addVectors(FuncVector, It->second);
@@ -144,7 +144,7 @@ void SymbolicEmbedder::computeEmbeddings() {
 Embedding SymbolicEmbedder::computeBB2Vec(const BasicBlock &BB) {
   Embedding BBVector(Dimension, 0);
 
-  for (auto &I : BB) {
+  for (const auto &I : BB) {
     Embedding InstVector(Dimension, 0);
 
     auto OpcVec = lookupVocab(I.getOpcodeName());
@@ -245,7 +245,7 @@ IR2VecVocabAnalysis::run(Module &M, ModuleAnalysisManager &AM) {
 
 void IR2VecPrinterPass::printVector(const Embedding &Vec) const {
   OS << " [";
-  for (auto &Elem : Vec)
+  for (const auto &Elem : Vec)
     OS << " " << format("%.2f", Elem) << " ";
   OS << "]\n";
 }