Some S-mode tests really only belong in M-mode
split out S-mode tests and M-mode tests
Merge rv64si and rv32si tests