Fix 'require' in benchmarks to work with new relative system (#1120)

Old style require is now called with `pcall` to support comparing
against Lua.
New style require is now a third option.

Edit: this will be a temporary solution until the 'paths' support in
.luaurc is fixed.

bench/bench_support.lua

@@ -66,7 +66,7 @@ end
 -- and 'false' otherwise.
 --
 -- Example usage:
---   local bench = script and require(script.Parent.bench_support) or require("bench_support")
+--   local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 --   function testFunc()
 --      ...
 --   end

bench/gc/test_BinaryTree.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_GC_Boehm_Trees.lua

@@ -1,5 +1,5 @@
 --!nonstrict
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 local stretchTreeDepth = 18 -- about 16Mb
 local longLivedTreeDepth = 16 -- about 4Mb

bench/gc/test_GC_Tree_Pruning_Eager.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
     local count = 1

bench/gc/test_GC_Tree_Pruning_Gen.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
     local count = 1

bench/gc/test_GC_Tree_Pruning_Lazy.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
     local count = 1

bench/gc/test_GC_hashtable_Keyval.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
     local t = {}

bench/gc/test_LB_mandel.lua

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_LargeTableCtor_array.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_LargeTableCtor_hash.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_Pcall_pcall_yield.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_SunSpider_3d-raytrace.lua

@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 ]]
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableCreate_nil.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableCreate_number.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableCreate_zerofill.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableMarshal_select.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableMarshal_table_pack.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/gc/test_TableMarshal_varargs.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_AbsSum_abs.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_AbsSum_and_or.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_AbsSum_math_abs.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Assert.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Factorial.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Failure_pcall_a_bar.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Failure_pcall_game_Foo.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Failure_xpcall_a_bar.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Failure_xpcall_game_Foo.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableCtor_array.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableCtor_hash.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableSum_loop_index.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableSum_loop_ipairs.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableSum_loop_iter.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_LargeTableSum_loop_pairs.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_MethodCalls.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_OOP_constructor.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_OOP_method_call.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_OOP_virtual_constructor.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Pcall_call_return.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Pcall_pcall_return.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Pcall_pcall_yield.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_Pcall_xpcall_return.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_exponent.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_math_sqrt.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_sqrt.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_sqrt_getfenv.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_SqrtSum_sqrt_roundabout.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_StringInterp.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 bench.runCode(function()
     for j=1,1e6 do

bench/micro_tests/test_TableCreate_nil.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableCreate_number.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableCreate_zerofill.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableFind_loop_ipairs.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableFind_table_find.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableInsertion_index_cached.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableInsertion_index_len.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableInsertion_table_insert.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableInsertion_table_insert_index.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableIteration.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_select.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_table_pack.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_table_unpack_array.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_table_unpack_range.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMarshal_varargs.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
 

bench/micro_tests/test_TableMove_empty_table.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
     local t = table.create(250001, 0)

bench/micro_tests/test_TableMove_same_table.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
     local t = table.create(5000001, 0)

bench/micro_tests/test_TableMove_table_create.lua

@@ -1,4 +1,4 @@
-local bench = script and require(script.Parent.bench_support) or require("bench_support")
+local bench = script and require(script.Parent.bench_support) or pcall(require, "bench_support") or require("../bench_support")
 
 function test()
     local t = table.create(250001, 0)