Restructure benchmarks
auto merge of #7687 : cmr/rust/benchmarks, r=huonw