diff --git a/compiler/src/iree/compiler/API/api_exports.c b/compiler/src/iree/compiler/API/api_exports.c
index 9b1be67..31250e7 100644
--- a/compiler/src/iree/compiler/API/api_exports.c
+++ b/compiler/src/iree/compiler/API/api_exports.c
@@ -341,6 +341,7 @@
 extern void mlirConversionPatternGetTypeConverter();
 extern void mlirConversionPatternRewriterAsPatternRewriter();
 extern void mlirConversionPatternRewriterConvertRegionTypes();
+extern void mlirConversionPatternRewriterReplaceOpWithMultiple();
 extern void mlirConversionTargetAddDynamicallyLegalDialect();
 extern void mlirConversionTargetAddDynamicallyLegalOp();
 extern void mlirConversionTargetAddIllegalDialect();
@@ -1097,7 +1098,12 @@
 extern void mlirTypeAttrGetName();
 extern void mlirTypeAttrGetTypeID();
 extern void mlirTypeAttrGetValue();
+extern void mlirTypeConverterAdd1ToNConversion();
+extern void mlirTypeConverterAdd1ToNTargetMaterialization();
 extern void mlirTypeConverterAddConversion();
+extern void mlirTypeConverterAddSourceMaterialization();
+extern void mlirTypeConverterAddTargetMaterialization();
+extern void mlirTypeConverterConversionResultsAppend();
 extern void mlirTypeConverterConvertType();
 extern void mlirTypeConverterCreate();
 extern void mlirTypeConverterDestroy();
@@ -1541,6 +1547,7 @@
   x += (uintptr_t)&mlirConversionPatternGetTypeConverter;
   x += (uintptr_t)&mlirConversionPatternRewriterAsPatternRewriter;
   x += (uintptr_t)&mlirConversionPatternRewriterConvertRegionTypes;
+  x += (uintptr_t)&mlirConversionPatternRewriterReplaceOpWithMultiple;
   x += (uintptr_t)&mlirConversionTargetAddDynamicallyLegalDialect;
   x += (uintptr_t)&mlirConversionTargetAddDynamicallyLegalOp;
   x += (uintptr_t)&mlirConversionTargetAddIllegalDialect;
@@ -2297,7 +2304,12 @@
   x += (uintptr_t)&mlirTypeAttrGetName;
   x += (uintptr_t)&mlirTypeAttrGetTypeID;
   x += (uintptr_t)&mlirTypeAttrGetValue;
+  x += (uintptr_t)&mlirTypeConverterAdd1ToNConversion;
+  x += (uintptr_t)&mlirTypeConverterAdd1ToNTargetMaterialization;
   x += (uintptr_t)&mlirTypeConverterAddConversion;
+  x += (uintptr_t)&mlirTypeConverterAddSourceMaterialization;
+  x += (uintptr_t)&mlirTypeConverterAddTargetMaterialization;
+  x += (uintptr_t)&mlirTypeConverterConversionResultsAppend;
   x += (uintptr_t)&mlirTypeConverterConvertType;
   x += (uintptr_t)&mlirTypeConverterCreate;
   x += (uintptr_t)&mlirTypeConverterDestroy;
diff --git a/compiler/src/iree/compiler/API/api_exports.def b/compiler/src/iree/compiler/API/api_exports.def
index 306a79c..738bcf2 100644
--- a/compiler/src/iree/compiler/API/api_exports.def
+++ b/compiler/src/iree/compiler/API/api_exports.def
@@ -331,6 +331,7 @@
   mlirConversionPatternGetTypeConverter
   mlirConversionPatternRewriterAsPatternRewriter
   mlirConversionPatternRewriterConvertRegionTypes
+  mlirConversionPatternRewriterReplaceOpWithMultiple
   mlirConversionTargetAddDynamicallyLegalDialect
   mlirConversionTargetAddDynamicallyLegalOp
   mlirConversionTargetAddIllegalDialect
@@ -1087,7 +1088,12 @@
   mlirTypeAttrGetName
   mlirTypeAttrGetTypeID
   mlirTypeAttrGetValue
+  mlirTypeConverterAdd1ToNConversion
+  mlirTypeConverterAdd1ToNTargetMaterialization
   mlirTypeConverterAddConversion
+  mlirTypeConverterAddSourceMaterialization
+  mlirTypeConverterAddTargetMaterialization
+  mlirTypeConverterConversionResultsAppend
   mlirTypeConverterConvertType
   mlirTypeConverterCreate
   mlirTypeConverterDestroy
diff --git a/compiler/src/iree/compiler/API/api_exports.ld b/compiler/src/iree/compiler/API/api_exports.ld
index c129fe7..66d031a 100644
--- a/compiler/src/iree/compiler/API/api_exports.ld
+++ b/compiler/src/iree/compiler/API/api_exports.ld
@@ -332,6 +332,7 @@
     mlirConversionPatternGetTypeConverter;
     mlirConversionPatternRewriterAsPatternRewriter;
     mlirConversionPatternRewriterConvertRegionTypes;
+    mlirConversionPatternRewriterReplaceOpWithMultiple;
     mlirConversionTargetAddDynamicallyLegalDialect;
     mlirConversionTargetAddDynamicallyLegalOp;
     mlirConversionTargetAddIllegalDialect;
@@ -1088,7 +1089,12 @@
     mlirTypeAttrGetName;
     mlirTypeAttrGetTypeID;
     mlirTypeAttrGetValue;
+    mlirTypeConverterAdd1ToNConversion;
+    mlirTypeConverterAdd1ToNTargetMaterialization;
     mlirTypeConverterAddConversion;
+    mlirTypeConverterAddSourceMaterialization;
+    mlirTypeConverterAddTargetMaterialization;
+    mlirTypeConverterConversionResultsAppend;
     mlirTypeConverterConvertType;
     mlirTypeConverterCreate;
     mlirTypeConverterDestroy;
diff --git a/compiler/src/iree/compiler/API/api_exports.macos.lst b/compiler/src/iree/compiler/API/api_exports.macos.lst
index bbcfd89..9c3804f 100644
--- a/compiler/src/iree/compiler/API/api_exports.macos.lst
+++ b/compiler/src/iree/compiler/API/api_exports.macos.lst
@@ -330,6 +330,7 @@
 _mlirConversionPatternGetTypeConverter
 _mlirConversionPatternRewriterAsPatternRewriter
 _mlirConversionPatternRewriterConvertRegionTypes
+_mlirConversionPatternRewriterReplaceOpWithMultiple
 _mlirConversionTargetAddDynamicallyLegalDialect
 _mlirConversionTargetAddDynamicallyLegalOp
 _mlirConversionTargetAddIllegalDialect
@@ -1086,7 +1087,12 @@
 _mlirTypeAttrGetName
 _mlirTypeAttrGetTypeID
 _mlirTypeAttrGetValue
+_mlirTypeConverterAdd1ToNConversion
+_mlirTypeConverterAdd1ToNTargetMaterialization
 _mlirTypeConverterAddConversion
+_mlirTypeConverterAddSourceMaterialization
+_mlirTypeConverterAddTargetMaterialization
+_mlirTypeConverterConversionResultsAppend
 _mlirTypeConverterConvertType
 _mlirTypeConverterCreate
 _mlirTypeConverterDestroy
diff --git a/third_party/llvm-project b/third_party/llvm-project
index ae7f0db..a3ae499 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit ae7f0db2a0d654f08377590b5722c1c40db0c76c
+Subproject commit a3ae4996bb220f9ec2c5450f2f2d3fb2e5ffe42e