[CIR] Check CLANG_ENABLE_CIR is actually enabled when using CIR

.github/workflows/clang-cir-tests.yml

@@ -0,0 +1,38 @@
+name: Clang CIR Tests
+
+permissions:
+  contents: read
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'clang/**'
+      - '.github/workflows/clang-cir-tests.yml'
+      - '.github/workflows/llvm-project-tests.yml'
+      - '!llvm/**'
+  pull_request:
+    branches:
+      - '**'
+    paths:
+      - 'clang/**'
+      - '.github/workflows/clang-cir-tests.yml'
+      - '.github/workflows/llvm-project-tests.yml'
+      - '!llvm/**'
+
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
+jobs:
+  check_clang_cir:
+    name: Test clang-cir
+    uses: ./.github/workflows/llvm-project-tests.yml
+    with:
+      build_target: check-clang-cir
+      projects: clang;mlir
+      extra_cmake_args: -DCLANG_ENABLE_CIR=ON

.github/workflows/libcxx-build-and-test.yaml

@@ -22,9 +22,6 @@ on:
       - 'runtimes/**'
       - 'cmake/**'
       - '.github/workflows/libcxx-build-and-test.yaml'
-  schedule:
-    # Run nightly at 08:00 UTC (aka 00:00 Pacific, aka 03:00 Eastern)
-    - cron: '0 8 * * *'
 
 permissions:
   contents: read # Default everything to read-only

.github/workflows/pr-code-format.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   code_formatter:
     runs-on: ubuntu-latest
-    if: github.repository == 'llvm/llvm-project'
+    if: github.repository == 'llvm/clangir'
     steps:
       - name: Fetch LLVM sources
         uses: actions/checkout@v4

README.md

@@ -1,44 +1,3 @@
-# The LLVM Compiler Infrastructure
+# ClangIR (CIR)
 
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/llvm/llvm-project/badge)](https://securityscorecards.dev/viewer/?uri=github.com/llvm/llvm-project)
-[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8273/badge)](https://www.bestpractices.dev/projects/8273)
-[![libc++](https://github.com/llvm/llvm-project/actions/workflows/libcxx-build-and-test.yaml/badge.svg?branch=main&event=schedule)](https://github.com/llvm/llvm-project/actions/workflows/libcxx-build-and-test.yaml?query=event%3Aschedule)
-
-Welcome to the LLVM project!
-
-This repository contains the source code for LLVM, a toolkit for the
-construction of highly optimized compilers, optimizers, and run-time
-environments.
-
-The LLVM project has multiple components. The core of the project is
-itself called "LLVM". This contains all of the tools, libraries, and header
-files needed to process intermediate representations and convert them into
-object files. Tools include an assembler, disassembler, bitcode analyzer, and
-bitcode optimizer.
-
-C-like languages use the [Clang](https://clang.llvm.org/) frontend. This
-component compiles C, C++, Objective-C, and Objective-C++ code into LLVM bitcode
--- and from there into object files, using LLVM.
-
-Other components include:
-the [libc++ C++ standard library](https://libcxx.llvm.org),
-the [LLD linker](https://lld.llvm.org), and more.
-
-## Getting the Source Code and Building LLVM
-
-Consult the
-[Getting Started with LLVM](https://llvm.org/docs/GettingStarted.html#getting-the-source-code-and-building-llvm)
-page for information on building and running LLVM.
-
-For information on how to contribute to the LLVM project, please take a look at
-the [Contributing to LLVM](https://llvm.org/docs/Contributing.html) guide.
-
-## Getting in touch
-
-Join the [LLVM Discourse forums](https://discourse.llvm.org/), [Discord
-chat](https://discord.gg/xS7Z362),
-[LLVM Office Hours](https://llvm.org/docs/GettingInvolved.html#office-hours) or
-[Regular sync-ups](https://llvm.org/docs/GettingInvolved.html#online-sync-ups).
-
-The LLVM project has adopted a [code of conduct](https://llvm.org/docs/CodeOfConduct.html) for
-participants to all modes of communication within the project.
+Check https://clangir.org for general information, build instructions and documentation.

clang-tools-extra/clang-tidy/CMakeLists.txt

@@ -23,7 +23,7 @@ add_clang_library(clangTidy
   ClangSACheckers
   omp_gen
   ClangDriverOptions
-  )
+)
 
 clang_target_link_libraries(clangTidy
   PRIVATE
@@ -77,6 +77,9 @@ add_subdirectory(performance)
 add_subdirectory(portability)
 add_subdirectory(readability)
 add_subdirectory(zircon)
+if(CLANG_ENABLE_CIR)
+  add_subdirectory(cir)
+endif()
 set(ALL_CLANG_TIDY_CHECKS
   clangTidyAndroidModule
   clangTidyAbseilModule
@@ -105,6 +108,9 @@ set(ALL_CLANG_TIDY_CHECKS
 if(CLANG_TIDY_ENABLE_STATIC_ANALYZER)
   list(APPEND ALL_CLANG_TIDY_CHECKS clangTidyMPIModule)
 endif()
+if(CLANG_ENABLE_CIR)
+  list(APPEND ALL_CLANG_TIDY_CHECKS clangTidyCIRModule)
+endif()
 set(ALL_CLANG_TIDY_CHECKS ${ALL_CLANG_TIDY_CHECKS} PARENT_SCOPE)
 
 # Other subtargets. These may reference ALL_CLANG_TIDY_CHECKS

clang-tools-extra/clang-tidy/ClangTidy.cpp

@@ -20,7 +20,10 @@
 #include "ClangTidyModuleRegistry.h"
 #include "ClangTidyProfiling.h"
 #include "ExpandModularHeadersPPCallbacks.h"
+#ifndef CLANG_TIDY_CONFIG_H
 #include "clang-tidy-config.h"
+#endif
+#include "utils/OptionsUtils.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Format/Format.h"
@@ -466,6 +469,7 @@ ClangTidyASTConsumerFactory::createASTConsumer(
     Consumers.push_back(std::move(AnalysisConsumer));
   }
 #endif // CLANG_TIDY_ENABLE_STATIC_ANALYZER
+
   return std::make_unique<ClangTidyASTConsumer>(
       std::move(Consumers), std::move(Profiling), std::move(Finder),
       std::move(Checks));

clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h

@@ -20,6 +20,18 @@
 #include "llvm/Support/Regex.h"
 #include <optional>
 
+// Workaround unitests not needing to change unittests to require
+// "clang-tidy-config.h" being generated.
+#if __has_include("clang-tidy-config.h")
+#ifndef CLANG_TIDY_CONFIG_H
+#include "clang-tidy-config.h"
+#endif
+#endif
+
+#if CLANG_ENABLE_CIR
+#include "clang/Basic/CodeGenOptions.h"
+#endif
+
 namespace clang {
 
 class ASTContext;
@@ -137,6 +149,12 @@ class ClangTidyContext {
   /// Gets the language options from the AST context.
   const LangOptions &getLangOpts() const { return LangOpts; }
 
+#if CLANG_ENABLE_CIR
+  /// Get and set CodeGenOpts
+  CodeGenOptions &getCodeGenOpts() { return CodeGenOpts; };
+  void setCodeGenOpts(CodeGenOptions &CGO) { CodeGenOpts = CGO; }
+#endif
+
   /// Returns the name of the clang-tidy check which produced this
   /// diagnostic ID.
   std::string getCheckName(unsigned DiagnosticID) const;
@@ -242,6 +260,10 @@ class ClangTidyContext {
 
   LangOptions LangOpts;
 
+#if CLANG_ENABLE_CIR
+  CodeGenOptions CodeGenOpts;
+#endif
+
   ClangTidyStats Stats;
 
   std::string CurrentBuildDirectory;

clang-tools-extra/clang-tidy/ClangTidyForceLinker.h

@@ -9,7 +9,9 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYFORCELINKER_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYFORCELINKER_H
 
+#ifndef CLANG_TIDY_CONFIG_H
 #include "clang-tidy-config.h"
+#endif
 #include "llvm/Support/Compiler.h"
 
 namespace clang::tidy {
@@ -137,6 +139,13 @@ extern volatile int ZirconModuleAnchorSource;
 static int LLVM_ATTRIBUTE_UNUSED ZirconModuleAnchorDestination =
     ZirconModuleAnchorSource;
 
+#if CLANG_ENABLE_CIR
+// This anchor is used to force the linker to link the CIRModule.
+extern volatile int CIRModuleAnchorSource;
+static int LLVM_ATTRIBUTE_UNUSED CIRModuleAnchorDestination =
+    CIRModuleAnchorSource;
+#endif
+
 } // namespace clang::tidy
 
 #endif

clang-tools-extra/clang-tidy/cir-tidy/tool/CMakeLists.txt

@@ -0,0 +1,50 @@
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
+
+set(LLVM_LINK_COMPONENTS
+  AllTargetsAsmParsers
+  AllTargetsDescs
+  AllTargetsInfos
+  FrontendOpenMP
+  support
+  )
+
+# Needed by LLVM's CMake checks because this file defines multiple targets.
+set(LLVM_OPTIONAL_SOURCES CIRTidyMain.cpp CIRTidyToolMain.cpp)
+
+add_clang_library(CIRTidyMain
+  CIRTidyMain.cpp
+
+  LINK_LIBS
+  CIRTidy
+  clangTidy
+  MLIRIR
+  ${ALL_CLANG_TIDY_CHECKS}
+  MLIRIR
+
+  DEPENDS
+  omp_gen
+  )
+
+clang_target_link_libraries(CIRTidyMain
+  PRIVATE
+  clangBasic
+  clangTooling
+  clangToolingCore
+  )
+
+add_clang_tool(cir-tidy
+  CIRTidyToolMain.cpp
+  )
+add_dependencies(cir-tidy
+  clang-resource-headers
+  )
+
+target_link_libraries(cir-tidy
+  PRIVATE
+  CIRTidyMain
+  CIRTidy
+  )
+
+install(TARGETS cir-tidy
+  DESTINATION bin
+  )

clang-tools-extra/clang-tidy/cir/CIRTidyModule.cpp

@@ -0,0 +1,34 @@
+//===--- CIRTidyModule.cpp - clang-tidy -----------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "../ClangTidy.h"
+#include "../ClangTidyModule.h"
+#include "../ClangTidyModuleRegistry.h"
+#include "Lifetime.h"
+
+namespace clang::tidy {
+namespace cir {
+
+class CIRModule : public ClangTidyModule {
+public:
+  void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
+    CheckFactories.registerCheck<Lifetime>("cir-lifetime-check");
+  }
+};
+
+} // namespace cir
+
+// Register the CIRTidyModule using this statically initialized variable.
+static ClangTidyModuleRegistry::Add<cir::CIRModule>
+    X("cir-module", "Adds ClangIR (CIR) based clang-tidy checks.");
+
+// This anchor is used to force the linker to link in the generated object file
+// and thus register the CIRModule.
+volatile int CIRModuleAnchorSource = 0;
+
+} // namespace clang::tidy

clang-tools-extra/clang-tidy/cir/CMakeLists.txt

@@ -0,0 +1,57 @@
+set(LLVM_LINK_COMPONENTS
+  FrontendOpenMP
+  Support
+  )
+
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
+include_directories( ${LLVM_MAIN_SRC_DIR}/../mlir/include )
+include_directories( ${CMAKE_BINARY_DIR}/tools/mlir/include )
+
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
+
+add_clang_library(clangTidyCIRModule
+  Lifetime.cpp
+  CIRTidyModule.cpp
+
+  LINK_LIBS
+  clangASTMatchers
+  clangCIR
+  clangFrontend
+  clangSerialization
+  clangTidy
+  clangTidyUtils
+  ${dialect_libs}
+  MLIRCIR
+  MLIRCIRTransforms
+  MLIRAffineToStandard
+  MLIRAnalysis
+  MLIRIR
+  MLIRLLVMCommonConversion
+  MLIRLLVMDialect
+  MLIRLLVMToLLVMIRTranslation
+  MLIRMemRefDialect
+  MLIRMemRefToLLVM
+  MLIRParser
+  MLIRPass
+  MLIRSideEffectInterfaces
+  MLIRSCFToControlFlow
+  MLIRFuncToLLVM
+  MLIRSupport
+  MLIRMemRefDialect
+  MLIRTargetLLVMIRExport
+  MLIRTransforms
+
+  DEPENDS
+  omp_gen
+  )
+
+clang_target_link_libraries(clangTidyCIRModule
+  PRIVATE
+  clangAnalysis
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangLex
+  clangTooling
+  clangToolingCore
+  )