From 4b620fcf0f2d847f2adccd03ad8ea11b5f56dc62 Mon Sep 17 00:00:00 2001
From: Richard Trieu <rtrieu@google.com>
Date: Sat, 11 May 2019 02:09:13 +0000
Subject: [PATCH] [NVPTX] Move InstPrinter files to MCTargetDesc.  NFC

For some targets, there is a circular dependency between InstPrinter and
MCTargetDesc.  Merging them together will fix this.  For the other targets,
the merging is to maintain consistency so all targets will have the same
structure.

llvm-svn: 360500
---
 llvm/lib/Target/NVPTX/CMakeLists.txt          |  1 -
 .../Target/NVPTX/InstPrinter/CMakeLists.txt   |  3 ---
 .../Target/NVPTX/InstPrinter/LLVMBuild.txt    | 22 -------------------
 llvm/lib/Target/NVPTX/LLVMBuild.txt           |  4 ++--
 .../Target/NVPTX/MCTargetDesc/CMakeLists.txt  |  1 +
 .../Target/NVPTX/MCTargetDesc/LLVMBuild.txt   |  2 +-
 .../NVPTXInstPrinter.cpp                      |  2 +-
 .../NVPTXInstPrinter.h                        |  4 ++--
 .../NVPTX/MCTargetDesc/NVPTXMCTargetDesc.cpp  |  2 +-
 llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp     |  2 +-
 10 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 llvm/lib/Target/NVPTX/InstPrinter/CMakeLists.txt
 delete mode 100644 llvm/lib/Target/NVPTX/InstPrinter/LLVMBuild.txt
 rename llvm/lib/Target/NVPTX/{InstPrinter => MCTargetDesc}/NVPTXInstPrinter.cpp (99%)
 rename llvm/lib/Target/NVPTX/{InstPrinter => MCTargetDesc}/NVPTXInstPrinter.h (93%)

diff --git a/llvm/lib/Target/NVPTX/CMakeLists.txt b/llvm/lib/Target/NVPTX/CMakeLists.txt
index d094620f1bf1..03d6201c9c60 100644
--- a/llvm/lib/Target/NVPTX/CMakeLists.txt
+++ b/llvm/lib/Target/NVPTX/CMakeLists.txt
@@ -37,6 +37,5 @@ set(NVPTXCodeGen_sources
 
 add_llvm_target(NVPTXCodeGen ${NVPTXCodeGen_sources})
 
-add_subdirectory(InstPrinter)
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/NVPTX/InstPrinter/CMakeLists.txt b/llvm/lib/Target/NVPTX/InstPrinter/CMakeLists.txt
deleted file mode 100644
index bb6c8abc961f..000000000000
--- a/llvm/lib/Target/NVPTX/InstPrinter/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_llvm_library(LLVMNVPTXAsmPrinter
-  NVPTXInstPrinter.cpp
-  )
diff --git a/llvm/lib/Target/NVPTX/InstPrinter/LLVMBuild.txt b/llvm/lib/Target/NVPTX/InstPrinter/LLVMBuild.txt
deleted file mode 100644
index 0773d2d1fadf..000000000000
--- a/llvm/lib/Target/NVPTX/InstPrinter/LLVMBuild.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-;===- ./lib/Target/NVPTX/InstPrinter/LLVMBuild.txt -------------*- Conf -*--===;
-;
-; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-; See https://llvm.org/LICENSE.txt for license information.
-; SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-;
-;===------------------------------------------------------------------------===;
-;
-; This is an LLVMBuild description file for the components in this subdirectory.
-;
-; For more information on the LLVMBuild system, please see:
-;
-;   http://llvm.org/docs/LLVMBuild.html
-;
-;===------------------------------------------------------------------------===;
-
-[component_0]
-type = Library
-name = NVPTXAsmPrinter
-parent = NVPTX
-required_libraries = MC Support
-add_to_library_groups = NVPTX
diff --git a/llvm/lib/Target/NVPTX/LLVMBuild.txt b/llvm/lib/Target/NVPTX/LLVMBuild.txt
index 56fbbf74fad3..56aaebddab58 100644
--- a/llvm/lib/Target/NVPTX/LLVMBuild.txt
+++ b/llvm/lib/Target/NVPTX/LLVMBuild.txt
@@ -15,7 +15,7 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = InstPrinter MCTargetDesc TargetInfo
+subdirectories = MCTargetDesc TargetInfo
 
 [component_0]
 type = TargetGroup
@@ -27,5 +27,5 @@ has_asmprinter = 1
 type = Library
 name = NVPTXCodeGen
 parent = NVPTX
-required_libraries = Analysis AsmPrinter CodeGen Core IPO MC NVPTXAsmPrinter NVPTXDesc NVPTXInfo Scalar SelectionDAG Support Target TransformUtils Vectorize
+required_libraries = Analysis AsmPrinter CodeGen Core IPO MC NVPTXDesc NVPTXInfo Scalar SelectionDAG Support Target TransformUtils Vectorize
 add_to_library_groups = NVPTX
diff --git a/llvm/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt
index 9b4eadd59a31..293436492fa9 100644
--- a/llvm/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_llvm_library(LLVMNVPTXDesc
+  NVPTXInstPrinter.cpp
   NVPTXMCAsmInfo.cpp
   NVPTXMCTargetDesc.cpp
   NVPTXTargetStreamer.cpp
diff --git a/llvm/lib/Target/NVPTX/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/NVPTX/MCTargetDesc/LLVMBuild.txt
index 3d1bd7797c32..538b675e1657 100644
--- a/llvm/lib/Target/NVPTX/MCTargetDesc/LLVMBuild.txt
+++ b/llvm/lib/Target/NVPTX/MCTargetDesc/LLVMBuild.txt
@@ -18,5 +18,5 @@
 type = Library
 name = NVPTXDesc
 parent = NVPTX
-required_libraries = MC NVPTXAsmPrinter NVPTXInfo Support
+required_libraries = MC NVPTXInfo Support
 add_to_library_groups = NVPTX
diff --git a/llvm/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.cpp b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXInstPrinter.cpp
similarity index 99%
rename from llvm/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.cpp
rename to llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXInstPrinter.cpp
index da0b146f21d7..b6eefe206268 100644
--- a/llvm/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.cpp
+++ b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXInstPrinter.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "InstPrinter/NVPTXInstPrinter.h"
+#include "MCTargetDesc/NVPTXInstPrinter.h"
 #include "MCTargetDesc/NVPTXBaseInfo.h"
 #include "NVPTX.h"
 #include "llvm/MC/MCExpr.h"
diff --git a/llvm/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.h b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXInstPrinter.h
similarity index 93%
rename from llvm/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.h
rename to llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXInstPrinter.h
index 8ce8e3170598..c38472925a29 100644
--- a/llvm/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.h
+++ b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXInstPrinter.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIB_TARGET_NVPTX_INSTPRINTER_NVPTXINSTPRINTER_H
-#define LLVM_LIB_TARGET_NVPTX_INSTPRINTER_NVPTXINSTPRINTER_H
+#ifndef LLVM_LIB_TARGET_NVPTX_MCTARGETDESC_NVPTXINSTPRINTER_H
+#define LLVM_LIB_TARGET_NVPTX_MCTARGETDESC_NVPTXINSTPRINTER_H
 
 #include "llvm/MC/MCInstPrinter.h"
 
diff --git a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCTargetDesc.cpp b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCTargetDesc.cpp
index e92c1911a4af..655f46999b60 100644
--- a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCTargetDesc.cpp
+++ b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCTargetDesc.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "InstPrinter/NVPTXInstPrinter.h"
+#include "NVPTXInstPrinter.h"
 #include "NVPTXMCAsmInfo.h"
 #include "NVPTXMCTargetDesc.h"
 #include "NVPTXTargetStreamer.h"
diff --git a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
index b9c7c4c53f95..68075779bfec 100644
--- a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
@@ -12,8 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "NVPTXAsmPrinter.h"
-#include "InstPrinter/NVPTXInstPrinter.h"
 #include "MCTargetDesc/NVPTXBaseInfo.h"
+#include "MCTargetDesc/NVPTXInstPrinter.h"
 #include "MCTargetDesc/NVPTXMCAsmInfo.h"
 #include "MCTargetDesc/NVPTXTargetStreamer.h"
 #include "NVPTX.h"