[Codegen][CPU] Rename LLVMCPU/Builtins -> builtins to mirror GPU plugin layout. (#24586)
The GPU target plugin keeps all embedded-bitcode builtins under a single
lowercase `builtins/` directory (compiler/plugins/target/ROCM/builtins/,
with `ukernel/`, `mlir_ukernel/`, ... as subdirs). LLVMCPU instead had a
capital `Builtins/`. That capital directory collides, on
case-insensitive filesystems (Windows, macOS), with a new lowercase
`builtins/` we want to add for the LLVMCPU C-ukernel framework -- the
collision clobbers the CMake `Builtins` target and breaks the MSVC
build. Lowercase the directory to match the GPU plugin layout and make
room for `builtins/ukernel/`.
Pure directory rename plus include-path / dep / generated-CMake updates;
no functional change.
Progress towards https://github.com/iree-org/iree/issues/24574.
Signed-off-by: Benoit Jacob <jacob.benoit.1@gmail.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
diff --git a/compiler/plugins/target/LLVMCPU/BUILD.bazel b/compiler/plugins/target/LLVMCPU/BUILD.bazel
index 2b931e7..8181ef5 100644
--- a/compiler/plugins/target/LLVMCPU/BUILD.bazel
+++ b/compiler/plugins/target/LLVMCPU/BUILD.bazel
@@ -31,7 +31,7 @@
":LLVMTargetOptions",
":LinkerTool",
":StaticLibraryGenerator",
- "//compiler/plugins/target/LLVMCPU/Builtins",
+ "//compiler/plugins/target/LLVMCPU/builtins:Builtins",
"//compiler/src/iree/compiler/Codegen/Common",
"//compiler/src/iree/compiler/Codegen/Dialect/CPU/IR:IREECPUDialect",
"//compiler/src/iree/compiler/Codegen/Dialect/Codegen/IR:IREECodegenDialect",
diff --git a/compiler/plugins/target/LLVMCPU/CMakeLists.txt b/compiler/plugins/target/LLVMCPU/CMakeLists.txt
index b0cb849..dc9e1d6 100644
--- a/compiler/plugins/target/LLVMCPU/CMakeLists.txt
+++ b/compiler/plugins/target/LLVMCPU/CMakeLists.txt
@@ -68,7 +68,7 @@
iree::compiler::Dialect::Util::IR
iree::compiler::PluginAPI
iree::compiler::Utils
- iree::compiler::plugins::target::LLVMCPU::Builtins
+ iree::compiler::plugins::target::LLVMCPU::builtins::Builtins
PUBLIC
)
diff --git a/compiler/plugins/target/LLVMCPU/LLVMCPUTarget.cpp b/compiler/plugins/target/LLVMCPU/LLVMCPUTarget.cpp
index 6e2f079..e5334da 100644
--- a/compiler/plugins/target/LLVMCPU/LLVMCPUTarget.cpp
+++ b/compiler/plugins/target/LLVMCPU/LLVMCPUTarget.cpp
@@ -6,14 +6,14 @@
#include <cstdlib>
-#include "compiler/plugins/target/LLVMCPU/Builtins/Device.h"
-#include "compiler/plugins/target/LLVMCPU/Builtins/Musl.h"
-#include "compiler/plugins/target/LLVMCPU/Builtins/UKernel.h"
#include "compiler/plugins/target/LLVMCPU/LLVMIRPasses.h"
#include "compiler/plugins/target/LLVMCPU/LLVMTargetOptions.h"
#include "compiler/plugins/target/LLVMCPU/LibraryBuilder.h"
#include "compiler/plugins/target/LLVMCPU/LinkerTool.h"
#include "compiler/plugins/target/LLVMCPU/StaticLibraryGenerator.h"
+#include "compiler/plugins/target/LLVMCPU/builtins/Device.h"
+#include "compiler/plugins/target/LLVMCPU/builtins/Musl.h"
+#include "compiler/plugins/target/LLVMCPU/builtins/UKernel.h"
#include "iree/compiler/Codegen/Common/Passes.h"
#include "iree/compiler/Codegen/Dialect/CPU/IR/IREECPUDialect.h"
#include "iree/compiler/Codegen/Dialect/CPU/IR/IREECPUTypes.h"
diff --git a/compiler/plugins/target/LLVMCPU/Builtins/BUILD.bazel b/compiler/plugins/target/LLVMCPU/builtins/BUILD.bazel
similarity index 100%
rename from compiler/plugins/target/LLVMCPU/Builtins/BUILD.bazel
rename to compiler/plugins/target/LLVMCPU/builtins/BUILD.bazel
diff --git a/compiler/plugins/target/LLVMCPU/Builtins/CMakeLists.txt b/compiler/plugins/target/LLVMCPU/builtins/CMakeLists.txt
similarity index 94%
rename from compiler/plugins/target/LLVMCPU/Builtins/CMakeLists.txt
rename to compiler/plugins/target/LLVMCPU/builtins/CMakeLists.txt
index 3f05b7d..5737b9b 100644
--- a/compiler/plugins/target/LLVMCPU/Builtins/CMakeLists.txt
+++ b/compiler/plugins/target/LLVMCPU/builtins/CMakeLists.txt
@@ -1,6 +1,6 @@
################################################################################
# Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from #
-# compiler/plugins/target/LLVMCPU/Builtins/BUILD.bazel #
+# compiler/plugins/target/LLVMCPU/builtins/BUILD.bazel #
# #
# Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary #
# CMake-only content. #
diff --git a/compiler/plugins/target/LLVMCPU/Builtins/Device.cpp b/compiler/plugins/target/LLVMCPU/builtins/Device.cpp
similarity index 98%
rename from compiler/plugins/target/LLVMCPU/Builtins/Device.cpp
rename to compiler/plugins/target/LLVMCPU/builtins/Device.cpp
index 0689fbd..28b62ee 100644
--- a/compiler/plugins/target/LLVMCPU/Builtins/Device.cpp
+++ b/compiler/plugins/target/LLVMCPU/builtins/Device.cpp
@@ -4,7 +4,7 @@
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#include "compiler/plugins/target/LLVMCPU/Builtins/Device.h"
+#include "compiler/plugins/target/LLVMCPU/builtins/Device.h"
#include "iree/builtins/device/libdevice_bitcode.h"
#include "llvm/Bitcode/BitcodeReader.h"
diff --git a/compiler/plugins/target/LLVMCPU/Builtins/Device.h b/compiler/plugins/target/LLVMCPU/builtins/Device.h
similarity index 100%
rename from compiler/plugins/target/LLVMCPU/Builtins/Device.h
rename to compiler/plugins/target/LLVMCPU/builtins/Device.h
diff --git a/compiler/plugins/target/LLVMCPU/Builtins/Musl.cpp b/compiler/plugins/target/LLVMCPU/builtins/Musl.cpp
similarity index 96%
rename from compiler/plugins/target/LLVMCPU/Builtins/Musl.cpp
rename to compiler/plugins/target/LLVMCPU/builtins/Musl.cpp
index 0189438..b3aa133 100644
--- a/compiler/plugins/target/LLVMCPU/Builtins/Musl.cpp
+++ b/compiler/plugins/target/LLVMCPU/builtins/Musl.cpp
@@ -4,7 +4,7 @@
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#include "compiler/plugins/target/LLVMCPU/Builtins/Musl.h"
+#include "compiler/plugins/target/LLVMCPU/builtins/Musl.h"
#include "iree/builtins/musl/bin/libmusl.h"
#include "llvm/Bitcode/BitcodeReader.h"
diff --git a/compiler/plugins/target/LLVMCPU/Builtins/Musl.h b/compiler/plugins/target/LLVMCPU/builtins/Musl.h
similarity index 100%
rename from compiler/plugins/target/LLVMCPU/Builtins/Musl.h
rename to compiler/plugins/target/LLVMCPU/builtins/Musl.h
diff --git a/compiler/plugins/target/LLVMCPU/Builtins/UKernel.cpp b/compiler/plugins/target/LLVMCPU/builtins/UKernel.cpp
similarity index 97%
rename from compiler/plugins/target/LLVMCPU/Builtins/UKernel.cpp
rename to compiler/plugins/target/LLVMCPU/builtins/UKernel.cpp
index bbb2922..f216c0f 100644
--- a/compiler/plugins/target/LLVMCPU/Builtins/UKernel.cpp
+++ b/compiler/plugins/target/LLVMCPU/builtins/UKernel.cpp
@@ -4,7 +4,7 @@
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#include "compiler/plugins/target/LLVMCPU/Builtins/UKernel.h"
+#include "compiler/plugins/target/LLVMCPU/builtins/UKernel.h"
#include "iree/builtins/ukernel/ukernel_bitcode.h"
#include "iree/compiler/Codegen/Utils/Utils.h"
diff --git a/compiler/plugins/target/LLVMCPU/Builtins/UKernel.h b/compiler/plugins/target/LLVMCPU/builtins/UKernel.h
similarity index 100%
rename from compiler/plugins/target/LLVMCPU/Builtins/UKernel.h
rename to compiler/plugins/target/LLVMCPU/builtins/UKernel.h
