Eliminate hwacha <-> riscv circular dependence