[benchmarks] Merge init benchmarks and add GCC + loop_tool.

This adds gcc-v0 and the loop_tool-v0 environments to the
gym.make(...) benchmark, and removes the benchmark for environment
initialization from an existing service, as that is now the default
behavior when using ServiceConnectionPools.

Author: ChrisCummins

benchmarks/bench_test.py

@@ -20,9 +20,8 @@
 import gym
 import pytest
 
-import examples.example_compiler_gym_service as dummy
-from compiler_gym.envs import CompilerEnv, LlvmEnv, llvm
-from compiler_gym.service import CompilerGymServiceConnection, ConnectionOpts
+import examples.example_compiler_gym_service  # noqa Environment import.
+from compiler_gym.envs import CompilerEnv
 from tests.pytest_plugins.llvm import OBSERVATION_SPACE_NAMES, REWARD_SPACE_NAMES
 from tests.test_main import main
 
@@ -45,31 +44,13 @@ def env(request) -> CompilerEnv:
 
 @pytest.mark.parametrize(
     "env_id",
-    ["llvm-v0", "example-cc-v0", "example-py-v0"],
-    ids=["llvm", "dummy-cc", "dummy-py"],
+    ["llvm-v0", "example-cc-v0", "example-py-v0", "loop_tool-v0"],
+    ids=["llvm", "dummy-cc", "dummy-py", "loop_tool"],
 )
-def test_make_local(benchmark, env_id):
+def test_make_env(benchmark, env_id):
     benchmark(lambda: gym.make(env_id).close())
 
 
-@pytest.mark.parametrize(
-    "args",
-    [
-        (llvm.LLVM_SERVICE_BINARY, LlvmEnv),
-        (dummy.EXAMPLE_CC_SERVICE_BINARY, CompilerEnv),
-        (dummy.EXAMPLE_PY_SERVICE_BINARY, CompilerEnv),
-    ],
-    ids=["llvm", "dummy-cc", "dummy-py"],
-)
-def test_make_service(benchmark, args):
-    service_binary, env_class = args
-    service = CompilerGymServiceConnection(service_binary, ConnectionOpts())
-    try:
-        benchmark(lambda: env_class(service=service.connection.url).close())
-    finally:
-        service.close()
-
-
 @pytest.mark.parametrize(
     "make_env",
     [