Skip to content

Commit 2bb5429

Browse files
committed
Integrate LLVM at aa1b416
Integrate llvm/llvm-project@aa1b416. IR/test changes to tests with amdgpu.fat_raw_buffer_cast from updates in upstream related to inferring canonical layout for resetOffset llvm/llvm-project@9052a85 No reverts or cherry-picks: dropped the former local revert since llvm/llvm-project#149393 was landed. Signed-off-by: Stanley Winata <[email protected]>
1 parent c682836 commit 2bb5429

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

compiler/src/iree/compiler/Codegen/Common/test/iree_comprehensive_bufferize.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2704,7 +2704,7 @@ func.func @rocdl_buffer_memory_space_elementwise_copy() {
27042704
// CHECK-DAG: %[[arg0:.+]] = hal.interface.binding.subspan layout({{.+}}) binding(0) : memref<256x256xf32, #hal.descriptor_type<storage_buffer>>
27052705
// CHECK-DAG: %[[arg1:.+]] = hal.interface.binding.subspan layout({{.+}}) binding(1) offset(%{{.+}}) : memref<256x256xf32, strided<[256, 1], offset: ?>, #hal.descriptor_type<storage_buffer>>
27062706
// CHECK-DAG: amdgpu.fat_raw_buffer_cast %[[arg0]] resetOffset : memref<256x256xf32, #hal.descriptor_type<storage_buffer>> to memref<256x256xf32, #amdgpu.address_space<fat_raw_buffer>>
2707-
// CHECK-DAG: amdgpu.fat_raw_buffer_cast %[[arg1]] resetOffset : memref<256x256xf32, strided<[256, 1], offset: ?>, #hal.descriptor_type<storage_buffer>> to memref<256x256xf32, strided<[256, 1]>, #amdgpu.address_space<fat_raw_buffer>>
2707+
// CHECK-DAG: amdgpu.fat_raw_buffer_cast %[[arg1]] resetOffset : memref<256x256xf32, strided<[256, 1], offset: ?>, #hal.descriptor_type<storage_buffer>> to memref<256x256xf32, #amdgpu.address_space<fat_raw_buffer>>
27082708
// CHECK-NOT: hal.interface.binding.subspan
27092709
// CHECK: return
27102710

compiler/src/iree/compiler/Codegen/Common/test/iree_expand_strided_metadata_with_subview_expansion.mlir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#pipeline_layout = #hal.pipeline.layout<constants = 1, bindings = [
44
#hal.pipeline.binding<storage_buffer>
55
]>
6-
func.func @expand_subview_into_resource_cast(%offset: index) -> memref<256x4096xf16, strided<[4096, 1]>, #amdgpu.address_space<fat_raw_buffer>> {
6+
func.func @expand_subview_into_resource_cast(%offset: index) -> memref<256x4096xf16, #amdgpu.address_space<fat_raw_buffer>> {
77
%c4096_i14 = arith.constant 4096 : i14
88
%0 = hal.interface.constant.load layout(#pipeline_layout) ordinal(0) : i32
99
%1 = arith.index_castui %0 : i32 to index
@@ -12,8 +12,8 @@ func.func @expand_subview_into_resource_cast(%offset: index) -> memref<256x4096x
1212
%subview = memref.subview %2[%offset, 0] [256, 4096] [1, 1]
1313
: memref<4096x4096xf16, #gpu.address_space<global>> to memref<256x4096xf16, strided<[4096, 1], offset: ?>, #gpu.address_space<global>>
1414
%38 = amdgpu.fat_raw_buffer_cast %subview cacheSwizzleStride(%c4096_i14) resetOffset
15-
: memref<256x4096xf16, strided<[4096, 1], offset: ?>, #gpu.address_space<global>> to memref<256x4096xf16, strided<[4096, 1]>, #amdgpu.address_space<fat_raw_buffer>>
16-
return %38 : memref<256x4096xf16, strided<[4096, 1]>, #amdgpu.address_space<fat_raw_buffer>>
15+
: memref<256x4096xf16, strided<[4096, 1], offset: ?>, #gpu.address_space<global>> to memref<256x4096xf16, #amdgpu.address_space<fat_raw_buffer>>
16+
return %38 : memref<256x4096xf16, #amdgpu.address_space<fat_raw_buffer>>
1717
}
1818

1919
// CHECK-LABEL: func.func @expand_subview_into_resource_cast

third_party/llvm-project

Submodule llvm-project updated 897 files

0 commit comments

Comments
 (0)