Support more than two ways in instruction cache

This is the support for more than two ways in the instruction test.