[PATCH] D84459: [llvm][NFC] Don't use llvm/Config/config.h in .h files

[Mircea Trofin via Phabricator via llvm-commits]

mtrofin updated this revision to Diff 280289.
mtrofin added a comment.
Herald added a subscriber: mgorny.

Feedback


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D84459/new/

https://reviews.llvm.org/D84459

Files:
  llvm/include/llvm/Analysis/InlineAdvisor.h
  llvm/include/llvm/Analysis/Utils/TFUtils.h
  llvm/include/llvm/Config/config.h.cmake
  llvm/include/llvm/Config/llvm-config.h.cmake
  llvm/lib/Analysis/DevelopmentModeInlineAdvisor.cpp
  llvm/lib/Analysis/ReleaseModeModelRunner.cpp


Index: llvm/lib/Analysis/ReleaseModeModelRunner.cpp
===================================================================
--- llvm/lib/Analysis/ReleaseModeModelRunner.cpp
+++ llvm/lib/Analysis/ReleaseModeModelRunner.cpp
@@ -10,7 +10,7 @@
 // Only inference is supported.
 //
 //===----------------------------------------------------------------------===//
-#include "llvm/Config/config.h"
+#include "llvm/Config/llvm-config.h"
 #if defined(LLVM_HAVE_TF_AOT)
 
 #include "llvm/Analysis/InlineModelFeatureMaps.h"
Index: llvm/lib/Analysis/DevelopmentModeInlineAdvisor.cpp
===================================================================
--- llvm/lib/Analysis/DevelopmentModeInlineAdvisor.cpp
+++ llvm/lib/Analysis/DevelopmentModeInlineAdvisor.cpp
@@ -11,7 +11,7 @@
 // loading of a model from a command line option.
 //
 //===----------------------------------------------------------------------===//
-#include "llvm/Config/config.h"
+#include "llvm/Config/llvm-config.h"
 #if defined(LLVM_HAVE_TF_API)
 
 #include "llvm/Analysis/CallGraph.h"
Index: llvm/include/llvm/Config/llvm-config.h.cmake
===================================================================
--- llvm/include/llvm/Config/llvm-config.h.cmake
+++ llvm/include/llvm/Config/llvm-config.h.cmake
@@ -82,4 +82,7 @@
 /* Define if LLVM was built with a dependency to the libtensorflow dynamic library */
 #cmakedefine LLVM_HAVE_TF_API
 
+/* Define if LLVM was built with a dependency to the tensorflow compiler */
+#cmakedefine LLVM_HAVE_TF_AOT
+
 #endif
Index: llvm/include/llvm/Config/config.h.cmake
===================================================================
--- llvm/include/llvm/Config/config.h.cmake
+++ llvm/include/llvm/Config/config.h.cmake
@@ -347,7 +347,4 @@
 /* Whether Timers signpost passes in Xcode Instruments */
 #cmakedefine01 LLVM_SUPPORT_XCODE_SIGNPOSTS
 
-/* Define if LLVM was built with a dependency to the tensorflow compiler */
-#cmakedefine LLVM_HAVE_TF_AOT
-
 #endif
Index: llvm/include/llvm/Analysis/Utils/TFUtils.h
===================================================================
--- llvm/include/llvm/Analysis/Utils/TFUtils.h
+++ llvm/include/llvm/Analysis/Utils/TFUtils.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_ANALYSIS_UTILS_TFUTILS_H
 #define LLVM_ANALYSIS_UTILS_TFUTILS_H
 
-#include "llvm/Config/config.h"
+#include "llvm/Config/llvm-config.h"
 
 #ifdef LLVM_HAVE_TF_API
 #include "llvm/IR/LLVMContext.h"
Index: llvm/include/llvm/Analysis/InlineAdvisor.h
===================================================================
--- llvm/include/llvm/Analysis/InlineAdvisor.h
+++ llvm/include/llvm/Analysis/InlineAdvisor.h
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "llvm/Analysis/InlineCost.h"
-#include "llvm/Config/config.h"
+#include "llvm/Config/llvm-config.h"
 #include "llvm/IR/PassManager.h"
 
 namespace llvm {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D84459.280289.patch
Type: text/x-patch
Size: 2819 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200723/f300861e/attachment.bin>