Partially revert #1688 in favor of style used in upstream MLIR (#1698)

cmake/modules/AddCIRCT.cmake

@@ -50,8 +50,3 @@ function(add_circt_translation_library name)
   set_property(GLOBAL APPEND PROPERTY CIRCT_TRANSLATION_LIBS ${name})
   add_circt_library(${ARGV} DEPENDS circt-headers)
 endfunction()
-
-function(add_circt_analysis_library name)
-  set_property(GLOBAL APPEND PROPERTY CIRCT_ANALYSIS_LIBS ${name})
-  add_circt_library(${ARGV} DEPENDS circt-headers)
-endfunction()

docs/Passes.md

@@ -4,10 +4,6 @@ This document describes the available CIRCT passes and their contracts.
 
 [TOC]
 
-## Analysis Passes
-
-[include "CIRCTAnalysisPasses.md"]
-
 ## Conversion Passes
 
 [include "CIRCTConversionPasses.md"]

include/circt/Analysis/CMakeLists.txt

@@ -1,5 +0,0 @@
-set(LLVM_TARGET_DEFINITIONS Passes.td)
-mlir_tablegen(Passes.h.inc -gen-pass-decls -name Analysis)
-add_public_tablegen_target(CIRCTAnalysisPassIncGen)
-
-add_circt_doc(Passes -gen-pass-doc CIRCTAnalysisPasses ./)

include/circt/Analysis/Passes.h

@@ -1,27 +0,0 @@
-//===- Passes.h - Analysis Pass Construction and Registration ---*- C++ -*-===//
-//
-// 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 fle contains the declarations to register analysis passes.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef CIRCT_ANALYSIS_PASSES_H
-#define CIRCT_ANALYSIS_PASSES_H
-
-#include "mlir/Pass/Pass.h"
-#include "mlir/Pass/PassRegistry.h"
-
-namespace circt {
-
-// Generate the code for registering conversion passes.
-#define GEN_PASS_REGISTRATION
-#include "circt/Analysis/Passes.h.inc"
-
-} // namespace circt
-
-#endif // CIRCT_ANALYSIS_PASSES_H

include/circt/Analysis/Passes.td

@@ -1,18 +0,0 @@
-//===-- Passes.td - Analysis pass definitions --------------*- tablegen -*-===//
-//
-// 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 file contains definitions for all analysis passes.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef CIRCT_ANALYSIS_PASSES_TD
-#define CIRCT_ANALYSIS_PASSES_TD
-
-include "mlir/Pass/PassBase.td"
-
-#endif // CIRCT_ANALYSIS_PASSES_TD

include/circt/CMakeLists.txt

@@ -1,3 +1,2 @@
-add_subdirectory(Analysis)
 add_subdirectory(Conversion)
 add_subdirectory(Dialect)

lib/Analysis/PassDetail.h

@@ -1,23 +0,0 @@
-//===- PassDetail.h - Analysis Pass class details ---------------*- C++ -*-===//
-//
-// 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
-//
-//===----------------------------------------------------------------------===//
-
-// NOLINTNEXTLINE(llvm-header-guard)
-#ifndef ANALYSIS_PASSDETAIL_H
-#define ANALYSIS_PASSDETAIL_H
-
-#include "mlir/Pass/Pass.h"
-
-namespace circt {
-
-// Generate the classes which represent the passes
-#define GEN_PASS_CLASSES
-#include "circt/Analysis/Passes.h.inc"
-
-} // namespace circt
-
-#endif // ANALYSIS_PASSDETAIL_H

test/CMakeLists.txt

@@ -1,3 +1,4 @@
+add_subdirectory(lib)
 add_subdirectory(CAPI)
 add_subdirectory(Dialect)
 

test/lib/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(Analysis)