diff --git a/include/aie/Dialect/AIEVec/AIEVecUtils.h b/include/aie/Dialect/AIEVec/AIEVecUtils.h index 2a6984560f..b7d27fe203 100644 --- a/include/aie/Dialect/AIEVec/AIEVecUtils.h +++ b/include/aie/Dialect/AIEVec/AIEVecUtils.h @@ -96,7 +96,7 @@ inline mlir::VectorType getVectorOpDestType(mlir::VectorType type, bool AIE2) { if (auto ftype = llvm::dyn_cast(stype)) { if (AIE2 && ftype.getWidth() == 16) return mlir::VectorType::get(type.getShape(), - mlir::FloatType::getF32(ftype.getContext())); + mlir::Float32Type::get(ftype.getContext())); // Floating point vector types for aie1 are returned as is since the // floating point operations write back to registers and not accumulators diff --git a/lib/Dialect/AIE/Transforms/AIECoreToStandard.cpp b/lib/Dialect/AIE/Transforms/AIECoreToStandard.cpp index 95aada6bb1..540844bded 100644 --- a/lib/Dialect/AIE/Transforms/AIECoreToStandard.cpp +++ b/lib/Dialect/AIE/Transforms/AIECoreToStandard.cpp @@ -51,7 +51,7 @@ static auto getAIE1Intrinsics(OpBuilder &builder) { Type int32Type = IntegerType::get(builder.getContext(), 32); Type int128Type = IntegerType::get(builder.getContext(), 128); Type int384Type = IntegerType::get(builder.getContext(), 384); - Type floatType = FloatType::getF32(builder.getContext()); + Type floatType = Float32Type::get(builder.getContext()); // Note that not all of these are valid for a particular design, or needed. // For right now, we will just accept the noise. diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 9b737f10ef..14c9af1d09 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -213,6 +213,9 @@ if (AIE_ENABLE_PYTHON_PASSES) endforeach() set_property(TARGET MLIRPythonSources.ExecutionEngine PROPERTY mlir_python_DEPENDS "") + # Set NB_DOMAIN for nanobind, to avoid domain conflict with other LLVM projects. + set(MLIR_BINDINGS_PYTHON_NB_DOMAIN "_aie") + add_mlir_python_modules(AIEPythonModules ROOT_PREFIX "${AIE_PYTHON_PACKAGES_DIR}/aie" INSTALL_PREFIX "${AIE_PYTHON_INSTALL_DIR}/aie" diff --git a/utils/clone-llvm.sh b/utils/clone-llvm.sh index 44694cbcb8..5a031e4c6b 100755 --- a/utils/clone-llvm.sh +++ b/utils/clone-llvm.sh @@ -13,8 +13,8 @@ ##===----------------------------------------------------------------------===## # The LLVM commit to use. -LLVM_PROJECT_COMMIT=f926bcf9068c808b643a56322b7ef6910eb36599 -DATETIME=2025011002 +LLVM_PROJECT_COMMIT=4b06b01e62ab0cfd059f47dceeb6cd0fb96304c9 +DATETIME=2025011619 WHEEL_VERSION=20.0.0.$DATETIME+${LLVM_PROJECT_COMMIT:0:8} ############################################################################################