Merge pull request #3289 from YosysHQ/micko/sim_improve