Merge pull request #1684 from riscv-software-src/simplify-zicfilp

Avoid checking ELP before every instruction fetch
7 jobs for master
in 0 seconds and was queued for 0 seconds