- uint32_t const_extract = (const_bits->u32 << 16) | const_offset->u32;
- extract = Operand(const_extract);
+ uint32_t extract = (const_bits->u32 << 16) | (const_offset->u32 & 0x1f);
+ aco_opcode opcode = instr->op == nir_op_ubfe ? aco_opcode::s_bfe_u32 : aco_opcode::s_bfe_i32;
+ bld.sop2(opcode, Definition(dst), bld.def(s1, scc), base, Operand(extract));
+ } else if (instr->op == nir_op_ubfe) {
+ Temp mask = bld.sop2(aco_opcode::s_bfm_b32, bld.def(s1), bits, offset);
+ Temp masked = bld.sop2(aco_opcode::s_and_b32, bld.def(s1), bld.def(s1, scc), base, mask);
+ bld.sop2(aco_opcode::s_lshr_b32, Definition(dst), bld.def(s1, scc), masked, offset);