Finish fixing includes

google · Jan 15, 2024 · 895a8bd · 895a8bd
1 parent 25123c7
commit 895a8bd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/gematria/datasets/find_accessed_addrs_exegesis.cc b/gematria/datasets/find_accessed_addrs_exegesis.cc
@@ -14,14 +14,18 @@
 
 #include "gematria/datasets/find_accessed_addrs_exegesis.h"
 
-#include "BenchmarkRunner.h"
-#include "LlvmState.h"
-#include "Target.h"
-#include "TargetSelect.h"
+// Use the absolute path for headers from llvm-exegesis as there is no
+// canonical include path within LLVM as they are not properly exposed through
+// a library and could potentially be confused with other LLVM includes.
+
 #include "X86.h"
 #include "X86InstrInfo.h"
 #include "X86RegisterInfo.h"
 #include "gematria/llvm/disassembler.h"
+#include "llvm/tools/llvm-exegesis/lib/BenchmarkRunner.h"
+#include "llvm/tools/llvm-exegesis/lib/LlvmState.h"
+#include "llvm/tools/llvm-exegesis/lib/Target.h"
+#include "llvm/tools/llvm-exegesis/lib/TargetSelect.h"
 
 using namespace llvm;
 using namespace llvm::exegesis;

diff --git a/gematria/datasets/find_accessed_addrs_exegesis.h b/gematria/datasets/find_accessed_addrs_exegesis.h
@@ -18,11 +18,15 @@
 #include <cstdint>
 #include <vector>
 
-#include "BenchmarkRunner.h"
-#include "LlvmState.h"
+// Use the absolute path for headers from llvm-exegesis as there is no
+// canonical include path within LLVM as they are not properly exposed through
+// a library and could potentially be confused with other LLVM includes.
+
 #include "gematria/datasets/find_accessed_addrs.h"
 #include "gematria/llvm/llvm_architecture_support.h"
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/tools/llvm-exegesis/lib/BenchmarkRunner.h"
+#include "llvm/tools/llvm-exegesis/lib/LlvmState.h"
 
 using namespace llvm;
 using namespace llvm::exegesis;

diff --git a/gematria/datasets/find_accessed_addrs_exegesis_test.cc b/gematria/datasets/find_accessed_addrs_exegesis_test.cc
@@ -14,13 +14,16 @@
 
 #include "gematria/datasets/find_accessed_addrs_exegesis.h"
 
-#include "TargetSelect.h"
+// Use the absolute path for headers from llvm-exegesis as there is no
+// canonical include path within LLVM as they are not properly exposed through
+// a library and could potentially be confused with other LLVM includes.
+
 #include "absl/log/check.h"
 #include "gematria/llvm/asm_parser.h"
 #include "gematria/llvm/llvm_architecture_support.h"
 #include "gtest/gtest.h"
 #include "llvm/MC/MCCodeEmitter.h"
-// #include "llvm/Testing/Support/Error.h"
+#include "llvm/tools/llvm-exegesis/lib/TargetSelect.h"
 
 using namespace llvm;
 using namespace llvm::exegesis;