[CIR] Add 'core-flat' as an option value for '-emit-mlir='

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

@@ -0,0 +1,49 @@
+name: Clang CIR Rebase
+
+on: workflow_dispatch
+
+permissions:
+  contents: write
+
+env:
+  UPSTREAM_REPO: https://github.com/llvm/llvm-project.git
+  TARGET_BRANCH: rebased-${{ github.head_ref || github.ref_name }}
+
+jobs:
+  rebase:
+    name: Rebase Clang CIR onto LLVM upstream
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.WORKFLOW_TOKEN }}
+
+      - name: Set up Git user
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Add upstream remote
+        run: |
+          git remote add upstream $UPSTREAM_REPO
+          git fetch upstream main
+
+      - name: Rebase CIR branch onto LLVM upstream
+        run: |
+          sh ./.github/workflows/rebase-clangir-onto-llvm-upstream.sh $TARGET_BRANCH
+
+      - name: Push rebase branch ${{ github.env.TARGET_BRANCH }}
+        run: |
+          git push --set-upstream origin ${{ github.env.TARGET_BRANCH }}
+
+  test-clang-cir:
+    name: Test Clang CIR
+    needs: rebase
+    uses: ./.github/workflows/llvm-project-tests.yml
+    with:
+      build_target: check-clang-cir
+      projects: clang;mlir
+      extra_cmake_args: -DCLANG_ENABLE_CIR=ON
+      repo_ref: ${{ github.env.TARGET_BRANCH }}

.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/llvm-project-tests.yml

@@ -51,6 +51,12 @@ on:
         type: string
         default: '3.11'
 
+      # Optional reference to the branch being checked out.
+      # Uses the current branch if not specified.
+      repo_ref:
+        required: false
+        type: string
+
 concurrency:
   # Skip intermediate builds: always.
   # Cancel intermediate builds: only if it is a pull request build.
@@ -93,6 +99,7 @@ jobs:
       # clean: false.
       - uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.repo_ref || github.ref }}
           fetch-depth: 250
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@v1

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

@@ -16,7 +16,7 @@ jobs:
     concurrency:
       group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
       cancel-in-progress: true
-    if: github.repository == 'llvm/llvm-project'
+    if: github.repository == 'llvm/clangir'
     steps:
       - name: Fetch LLVM sources
         uses: actions/checkout@v4

.github/workflows/rebase-clangir-onto-llvm-upstream.sh

@@ -0,0 +1,118 @@
+#!/bin/bash
+
+set -e
+
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+REBASE_BRANCH=rebased-clangir-onto-llvm-upstream
+TARGET_BRANCH=$1
+RUN_CHECK=false
+
+log() { printf "%b[%s]%b %s\n" "$1" "$2" "$NC" "$3"; }
+log_info() { log "$GREEN" "INFO" "$1"; }
+log_warn() { log "$YELLOW" "WARN" "$1"; }
+log_error() { log "$RED" "ERROR" "$1" >&2; }
+
+error_exit() {
+    log_error "$1"
+    exit 1
+}
+
+is_rebasing() {
+    git rev-parse --git-path rebase-merge >/dev/null 2>&1 ||
+        git rev-parse --git-path rebase-apply >/dev/null 2>&1
+}
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+    --checked)
+        RUN_CHECK=true
+        shift
+        ;;
+    *)
+        TARGET_BRANCH="$1"
+        shift
+        ;;
+    esac
+done
+
+git rev-parse --is-inside-work-tree >/dev/null 2>&1 ||
+    error_exit "Not in a Git repository."
+
+git remote get-url upstream >/dev/null 2>&1 ||
+    error_exit "Upstream remote not found."
+
+log_info "Fetching latest changes from upstream..."
+
+git fetch upstream main ||
+    error_exit "Failed to fetch from upstream."
+
+REBASING_CIR_BRANCH=$(git branch --show-current)
+
+if [ -z "$COMMON_ANCESTOR" ]; then
+    COMMON_ANCESTOR=$(git merge-base upstream/main "$REBASING_CIR_BRANCH") ||
+        error_exit "Could not find common ancestor."
+    log_info "Common ancestor commit: $COMMON_ANCESTOR"
+fi
+
+if [ "$REBASING_CIR_BRANCH" != "$REBASE_BRANCH" ]; then
+    if git rev-parse --verify "$REBASE_BRANCH" >/dev/null 2>&1; then
+        git branch -D "$REBASE_BRANCH" >/dev/null 2>&1 ||
+            log_warn "Failed to delete existing branch $REBASE_BRANCH."
+    fi
+
+    git switch -c "$REBASE_BRANCH" "$COMMON_ANCESTOR" ||
+        error_exit "Failed to create branch $REBASE_BRANCH."
+fi
+
+#
+# Rebase upstream changes
+#
+log_info "Processing upstream commits..."
+git rebase upstream/main ||
+    error_exit "Failed to rebase."
+
+#
+# Reverse upstream CIR commits
+#
+log_info "Reverting upstream CIR commits..."
+git log --grep="\[CIR\]" --format="%H %s" "$COMMON_ANCESTOR..upstream/main" | while read -r HASH MESSAGE; do
+    log_info "Reverting: $MESSAGE"
+
+    if ! git revert --no-edit "$HASH"; then
+        error_exit "Failed to revert commit $HASH"
+    fi
+done
+
+#
+# Rebase CIR commits
+#
+log_info "Rebasing CIR incubator commits..."
+
+if [ -z "$TARGET_BRANCH" ]; then
+    log_error "Target branch not specified."
+    exit 1
+fi
+
+if git rev-parse --verify "$TARGET_BRANCH" >/dev/null 2>&1; then
+    git branch -D "$TARGET_BRANCH" >/dev/null 2>&1 ||
+        error_exit "Failed to delete existing branch $TARGET_BRANCH."
+fi
+
+git switch "$REBASING_CIR_BRANCH" ||
+    error_exit "Failed to switch to $REBASING_CIR_BRANCH."
+git checkout -b "$TARGET_BRANCH" ||
+    error_exit "Failed to checkout $TARGET_BRANCH."
+
+if [ "$RUN_CHECK" = true ]; then
+    git rebase --exec "ninja -C build check-clang-cir" "$REBASE_BRANCH" "$TARGET_BRANCH" ||
+        error_exit "Failed to rebase."
+else
+    git rebase "$REBASE_BRANCH" "$TARGET_BRANCH" ||
+        error_exit "Failed to rebase."
+fi
+
+log_info "Rebase completed successfully!"

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

@@ -8,7 +8,7 @@ configure_file(
   ${CMAKE_CURRENT_BINARY_DIR}/clang-tidy-config.h)
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 
-add_clang_library(clangTidy STATIC
+add_clang_library(clangTidy
   ClangTidy.cpp
   ClangTidyCheck.cpp
   ClangTidyModule.cpp
@@ -23,7 +23,7 @@ add_clang_library(clangTidy STATIC
   ClangSACheckers
   omp_gen
   ClangDriverOptions
-  )
+)
 
 clang_target_link_libraries(clangTidy
   PRIVATE
@@ -76,6 +76,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
@@ -104,6 +107,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;
@@ -140,6 +152,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;
@@ -245,6 +263,10 @@ class ClangTidyContext {
 
   LangOptions LangOpts;
 
+#if CLANG_ENABLE_CIR
+  CodeGenOptions CodeGenOpts;
+#endif
+
   ClangTidyStats Stats;
 
   std::string CurrentBuildDirectory;