update cycles per instruction, except for branch instructions
Merge branch 'fix-clock-cycles' into develop