diff --git a/.pick_status.json b/.pick_status.json index 7188b1faa96..7457362dfe5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1372,7 +1372,7 @@ "description": "aco: add missing usable_read2 check", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "57e6886f981ca629a863544df253b9ecb3604eec" }, diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 6b39d87e3a0..379a13efc44 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -3489,7 +3489,7 @@ Temp lds_load_callback(Builder& bld, const LoadEmitInfo &info, } else if (bytes_needed >= 8 && align % 8 == 0) { size = 8; op = aco_opcode::ds_read_b64; - } else if (bytes_needed >= 8 && align % 4 == 0 && const_offset % 4 == 0) { + } else if (bytes_needed >= 8 && align % 4 == 0 && const_offset % 4 == 0 && usable_read2) { size = 8; read2 = true; op = aco_opcode::ds_read2_b32;