From 4c3e6b3daa84df057b77e7882a58fe2f6d634558 Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Tue, 23 Jan 2024 13:58:14 +0100
Subject: [PATCH 01/10] =?UTF-8?q?=E2=9C=A8=20Update=20target=20indep=20com?=
 =?UTF-8?q?piler=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/templates/index.html | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/mqt/benchviewer/templates/index.html b/src/mqt/benchviewer/templates/index.html
index c77cba5a8..0ee9f5dce 100644
--- a/src/mqt/benchviewer/templates/index.html
+++ b/src/mqt/benchviewer/templates/index.html
@@ -241,7 +241,18 @@ <h6>Target-independent Level</h6>
               Select the used compiler:
             </p>
             <div class="d-flex">
-              <div class="col-md-6 align-items-center">
+              <div class="col-md-4 align-items-center">
+                <input
+                  class="form-check-input"
+                  type="checkbox"
+                  id="indep_bqskit_compiler"
+                  name="indep_bqskit_compiler"
+                  value="true"
+                />
+                <label for="indep_bqskit_compiler">BQSKit</label>
+              </div>
+
+              <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
@@ -252,7 +263,7 @@ <h6>Target-independent Level</h6>
                 <label for="indep_qiskit_compiler">Qiskit</label>
               </div>
 
-              <div class="col-md-6 align-items-center">
+              <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"

From c63469fc652e98aaa4d20da4351987a18ccb9120 Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Tue, 23 Jan 2024 15:02:04 +0100
Subject: [PATCH 02/10] =?UTF-8?q?=E2=9C=A8=20Update=20native=20dep=20compi?=
 =?UTF-8?q?ler=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/templates/index.html | 64 +++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/mqt/benchviewer/templates/index.html b/src/mqt/benchviewer/templates/index.html
index 0ee9f5dce..3e6fff24f 100644
--- a/src/mqt/benchviewer/templates/index.html
+++ b/src/mqt/benchviewer/templates/index.html
@@ -344,7 +344,19 @@ <h6>Target-dependent Native Gates Level</h6>
             </p>
 
             <div class="d-flex">
-              <div class="col-md-6 align-items-center">
+              <div class="col-md-4 align-items-center">
+                <input
+                  class="form-check-input"
+                  type="checkbox"
+                  onchange="toggleNativeBQSKit()"
+                  id="nativegates_bqskit_compiler"
+                  name="nativegates_bqskit_compiler"
+                  value="true"
+                />
+                <label for="nativegates_bqskit_compiler">BQSKit</label>
+              </div>
+
+              <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
@@ -356,7 +368,7 @@ <h6>Target-dependent Native Gates Level</h6>
                 <label for="nativegates_qiskit_compiler">Qiskit</label>
               </div>
 
-              <div class="col-md-6 align-items-center">
+              <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
@@ -367,6 +379,47 @@ <h6>Target-dependent Native Gates Level</h6>
                 <label for="nativegates_tket_compiler">TKET</label>
               </div>
             </div>
+            <p class="text-justify" style="margin: 0px; margin-top: 15px">
+              If BQSKit is selected, select its optimization level:
+            </p>
+            <div class="col-md-12 align-items-center">
+              <input
+                class="form-check-input"
+                type="checkbox"
+                name="nativegates_bqskit_compiler_opt1"
+                value="true"
+                id="nativegates_bqskit_compiler_opt1"
+                disabled
+              />
+              <label for="nativegates_bqskit_compiler_opt1">Opt. 1</label>
+              <input
+                class="form-check-input"
+                type="checkbox"
+                name="nativegates_bqskit_compiler_opt2"
+                value="true"
+                id="nativegates_bqskit_compiler_opt2"
+                disabled
+              />
+              <label for="nativegates_bqskit_compiler_opt2">Opt. 2</label>
+              <input
+                class="form-check-input"
+                type="checkbox"
+                name="nativegates_bqskit_compiler_opt3"
+                value="true"
+                id="nativegates_bqskit_compiler_opt3"
+                disabled
+              />
+              <label for="nativegates_bqskit_compiler_opt3">Opt. 3</label>
+              <input
+                class="form-check-input"
+                type="checkbox"
+                name="nativegates_bqskit_compiler_opt4"
+                value="true"
+                id="nativegates_bqskit_compiler_opt4"
+                disabled
+              />
+              <label for="nativegates_bqskit_compiler_opt4">Opt. 4</label>
+            </div>
             <p class="text-justify" style="margin: 0px; margin-top: 15px">
               If Qiskit is selected, select its optimization level:
             </p>
@@ -690,6 +743,13 @@ <h4>Reference</h4>
     ></script>
 
     <script>
+      function toggleNativeBQSKit() {
+          document.getElementById("nativegates_bqskit_compiler_opt1").disabled = !document.getElementById("nativegates_bqskit_compiler_opt1").disabled
+          document.getElementById("nativegates_bqskit_compiler_opt2").disabled = !document.getElementById("nativegates_bqskit_compiler_opt2").disabled
+          document.getElementById("nativegates_bqskit_compiler_opt3").disabled = !document.getElementById("nativegates_bqskit_compiler_opt3").disabled
+          document.getElementById("nativegates_bqskit_compiler_opt4").disabled = !document.getElementById("nativegates_bqskit_compiler_opt4").disabled
+      }
+
       function toggleNativeQiskit() {
           document.getElementById("nativegates_qiskit_compiler_opt0").disabled = !document.getElementById("nativegates_qiskit_compiler_opt0").disabled
           document.getElementById("nativegates_qiskit_compiler_opt1").disabled = !document.getElementById("nativegates_qiskit_compiler_opt1").disabled

From e8b31cfcdc639d1398df0ff89db1c6b8977f8831 Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Tue, 23 Jan 2024 15:12:22 +0100
Subject: [PATCH 03/10] =?UTF-8?q?=E2=9C=A8=20Update=20target=20dep=20compi?=
 =?UTF-8?q?ler=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/templates/index.html | 65 +++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/mqt/benchviewer/templates/index.html b/src/mqt/benchviewer/templates/index.html
index 3e6fff24f..dafb2c0d5 100644
--- a/src/mqt/benchviewer/templates/index.html
+++ b/src/mqt/benchviewer/templates/index.html
@@ -562,7 +562,18 @@ <h6>Target-dependent Mapped Level</h6>
               Select the used compiler:
             </p>
             <div class="d-flex">
-              <div class="col-md-6 align-items-center">
+              <div class="col-md-4 align-items-center">
+                <input
+                  class="form-check-input"
+                  type="checkbox"
+                  value="true"
+                  onchange="toggleMappedBQSKit()"
+                  id="mapped_bqskit_compiler"
+                  name="mapped_bqskit_compiler"
+                />
+                <label for="mapped_bqskit_compiler">BQSKit</label>
+              </div>
+              <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
@@ -573,7 +584,7 @@ <h6>Target-dependent Mapped Level</h6>
                 />
                 <label for="mapped_qiskit_compiler">Qiskit</label>
               </div>
-              <div class="col-md-6 align-items-center">
+              <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
@@ -585,6 +596,49 @@ <h6>Target-dependent Mapped Level</h6>
                 <label for="mapped_tket_compiler">TKET</label>
               </div>
             </div>
+            <div class="row">
+              <p class="text-justify" style="margin: 0px; margin-top: 15px">
+                If BQSKit is selected, select its optimization level:
+              </p>
+              <div class="col-md-12 align-items-center">
+                <input
+                  class="form-check-input"
+                  type="checkbox"
+                  value="true"
+                  disabled
+                  id="mapped_bqskit_compiler_opt1"
+                  name="mapped_bqskit_compiler_opt1"
+                />
+                <label for="mapped_bqskit_compiler_opt1">Opt. 1</label>
+                <input
+                  class="form-check-input"
+                  type="checkbox"
+                  value="true"
+                  disabled
+                  id="mapped_bqskit_compiler_opt2"
+                  name="mapped_bqskit_compiler_opt2"
+                />
+                <label for="mapped_bqskit_compiler_opt2">Opt. 2</label>
+                <input
+                  class="form-check-input"
+                  type="checkbox"
+                  value="true"
+                  disabled
+                  id="mapped_bqskit_compiler_opt3"
+                  name="mapped_bqskit_compiler_opt3"
+                />
+                <label for="mapped_bqskit_compiler_opt3">Opt. 3</label>
+                <input
+                  class="form-check-input"
+                  type="checkbox"
+                  value="true"
+                  disabled
+                  id="mapped_bqskit_compiler_opt4"
+                  name="mapped_bqskit_compiler_opt4"
+                />
+                <label for="mapped_bqskit_compiler_opt4">Opt. 4</label>
+              </div>
+            </div>
             <div class="row">
               <p class="text-justify" style="margin: 0px; margin-top: 15px">
                 If Qiskit is selected, select its optimization level:
@@ -757,6 +811,13 @@ <h4>Reference</h4>
           document.getElementById("nativegates_qiskit_compiler_opt3").disabled = !document.getElementById("nativegates_qiskit_compiler_opt3").disabled
       }
 
+      function toggleMappedBQSKit() {
+          document.getElementById("mapped_bqskit_compiler_opt1").disabled = !document.getElementById("mapped_bqskit_compiler_opt1").disabled
+          document.getElementById("mapped_bqskit_compiler_opt2").disabled = !document.getElementById("mapped_bqskit_compiler_opt2").disabled
+          document.getElementById("mapped_bqskit_compiler_opt3").disabled = !document.getElementById("mapped_bqskit_compiler_opt3").disabled
+          document.getElementById("mapped_bqskit_compiler_opt4").disabled = !document.getElementById("mapped_bqskit_compiler_opt4").disabled
+      }
+
       function toggleMappedQiskit() {
           document.getElementById("mapped_qiskit_compiler_opt0").disabled = !document.getElementById("mapped_qiskit_compiler_opt0").disabled
           document.getElementById("mapped_qiskit_compiler_opt1").disabled = !document.getElementById("mapped_qiskit_compiler_opt1").disabled

From 8ccb88a3145c39187d71f1cf82429bfb8f7e33d1 Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Tue, 23 Jan 2024 15:18:41 +0100
Subject: [PATCH 04/10] =?UTF-8?q?=E2=9C=A8=20Add=20bqskit=20parsing=20of?=
 =?UTF-8?q?=20benchmark=20file=20data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/backend.py |  2 ++
 tests/test_benchviewer.py      | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/mqt/benchviewer/backend.py b/src/mqt/benchviewer/backend.py
index 9d6e664e0..c9cb1dbae 100644
--- a/src/mqt/benchviewer/backend.py
+++ b/src/mqt/benchviewer/backend.py
@@ -620,6 +620,8 @@ def get_target_device(filename: str) -> str:
 
 
 def get_compiler_and_settings(filename: str) -> tuple[str, str | int | None]:
+    if "bqskit" in filename:
+        return "bqskit", get_opt_level(filename)
     if "qiskit" in filename:
         return "qiskit", get_opt_level(filename)
     if "tket" in filename:
diff --git a/tests/test_benchviewer.py b/tests/test_benchviewer.py
index 75338d100..bc77b8965 100644
--- a/tests/test_benchviewer.py
+++ b/tests/test_benchviewer.py
@@ -75,6 +75,21 @@ def test_get_num_qubits(filename: str, expected_res: int) -> None:
                 filename="dj_mapped_ibm_washington_qiskit_opt3_103.qasm",
             ),
         ),
+        (
+            "dj_mapped_ibm_washington_bqskit_opt3_103.qasm",
+            backend.ParsedBenchmarkName(
+                benchmark="dj",
+                num_qubits=103,
+                indep_flag=False,
+                nativegates_flag=False,
+                mapped_flag=True,
+                compiler="bqskit",
+                compiler_settings=3,
+                gate_set="ibm",
+                target_device="ibm_washington",
+                filename="dj_mapped_ibm_washington_bqskit_opt3_103.qasm",
+            ),
+        ),
         (
             "pricingcall_mapped_oqc_lucy_tket_line_5.qasm",
             backend.ParsedBenchmarkName(

From 9ff9bc1e13ba99ac58a6e79c15a6eaf50b6a4176 Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Tue, 23 Jan 2024 16:36:38 +0100
Subject: [PATCH 05/10] =?UTF-8?q?=E2=9C=A8=20Add=20bqskit=20to=20preparing?=
 =?UTF-8?q?=20form=20input?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/backend.py | 26 +++++++++++++++++++
 tests/test_benchviewer.py      | 47 ++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/src/mqt/benchviewer/backend.py b/src/mqt/benchviewer/backend.py
index c9cb1dbae..feced946d 100644
--- a/src/mqt/benchviewer/backend.py
+++ b/src/mqt/benchviewer/backend.py
@@ -29,14 +29,19 @@ class BenchmarkConfiguration:
     min_qubits: int
     max_qubits: int
     indices_benchmarks: list[int]
+    indep_bqskit_compiler: bool
     indep_qiskit_compiler: bool
     indep_tket_compiler: bool
+    nativegates_bqskit_compiler: bool
     nativegates_qiskit_compiler: bool
     nativegates_tket_compiler: bool
+    mapped_bqskit_compiler: bool
     mapped_qiskit_compiler: bool
     mapped_tket_compiler: bool
+    native_bqskit_opt_lvls: list[int] | None = None
     native_qiskit_opt_lvls: list[int] | None = None
     native_gatesets: list[str] | None = None
+    mapped_bqskit_opt_lvls: list[int] | None = None
     mapped_qiskit_opt_lvls: list[int] | None = None
     mapped_tket_placements: list[str] | None = None
     mapped_devices: list[str] | None = None
@@ -308,14 +313,19 @@ def prepare_form_input(self, form_data: dict[str, str]) -> BenchmarkConfiguratio
         min_qubits = 2
         max_qubits = 130
         indices_benchmarks = []
+        indep_bqskit_compiler = False
         indep_qiskit_compiler = False
         indep_tket_compiler = False
+        nativegates_bqskit_compiler = False
         nativegates_qiskit_compiler = False
         nativegates_tket_compiler = False
+        native_bqskit_opt_lvls = []
         native_qiskit_opt_lvls = []
         native_gatesets = []
+        mapped_bqskit_compiler = False
         mapped_qiskit_compiler = False
         mapped_tket_compiler = False
+        mapped_bqskit_opt_lvls = []
         mapped_qiskit_opt_lvls = []
         mapped_tket_placements = []
         mapped_devices = []
@@ -328,11 +338,17 @@ def prepare_form_input(self, form_data: dict[str, str]) -> BenchmarkConfiguratio
             min_qubits = int(v) if "minQubits" in k and v else min_qubits
             max_qubits = int(v) if "maxQubits" in k and v else max_qubits
 
+            indep_bqskit_compiler = "indep_bqskit_compiler" in k or indep_bqskit_compiler
             indep_qiskit_compiler = "indep_qiskit_compiler" in k or indep_qiskit_compiler
             indep_tket_compiler = "indep_tket_compiler" in k or indep_tket_compiler
 
+            nativegates_bqskit_compiler = "nativegates_bqskit_compiler" in k or nativegates_bqskit_compiler
             nativegates_qiskit_compiler = "nativegates_qiskit_compiler" in k or nativegates_qiskit_compiler
             nativegates_tket_compiler = "nativegates_tket_compiler" in k or nativegates_tket_compiler
+            native_bqskit_opt_lvls.append(1) if "nativegates_bqskit_compiler_opt1" in k else None
+            native_bqskit_opt_lvls.append(2) if "nativegates_bqskit_compiler_opt2" in k else None
+            native_bqskit_opt_lvls.append(3) if "nativegates_bqskit_compiler_opt3" in k else None
+            native_bqskit_opt_lvls.append(4) if "nativegates_bqskit_compiler_opt4" in k else None
             native_qiskit_opt_lvls.append(0) if "nativegates_qiskit_compiler_opt0" in k else None
             native_qiskit_opt_lvls.append(1) if "nativegates_qiskit_compiler_opt1" in k else None
             native_qiskit_opt_lvls.append(2) if "nativegates_qiskit_compiler_opt2" in k else None
@@ -343,8 +359,13 @@ def prepare_form_input(self, form_data: dict[str, str]) -> BenchmarkConfiguratio
             native_gatesets.append("ionq") if "nativegates_ionq" in k else None
             native_gatesets.append("quantinuum") if "nativegates_quantinuum" in k else None
 
+            mapped_bqskit_compiler = "mapped_bqskit_compiler" in k or mapped_bqskit_compiler
             mapped_qiskit_compiler = "mapped_qiskit_compiler" in k or mapped_qiskit_compiler
             mapped_tket_compiler = "mapped_tket_compiler" in k or mapped_tket_compiler
+            mapped_bqskit_opt_lvls.append(1) if "mapped_bqskit_compiler_opt1" in k else None
+            mapped_bqskit_opt_lvls.append(2) if "mapped_bqskit_compiler_opt2" in k else None
+            mapped_bqskit_opt_lvls.append(3) if "mapped_bqskit_compiler_opt3" in k else None
+            mapped_bqskit_opt_lvls.append(4) if "mapped_bqskit_compiler_opt4" in k else None
             mapped_qiskit_opt_lvls.append(0) if "mapped_qiskit_compiler_opt0" in k else None
             mapped_qiskit_opt_lvls.append(1) if "mapped_qiskit_compiler_opt1" in k else None
             mapped_qiskit_opt_lvls.append(2) if "mapped_qiskit_compiler_opt2" in k else None
@@ -363,14 +384,19 @@ def prepare_form_input(self, form_data: dict[str, str]) -> BenchmarkConfiguratio
             min_qubits=min_qubits,
             max_qubits=max_qubits,
             indices_benchmarks=indices_benchmarks,
+            indep_bqskit_compiler=indep_bqskit_compiler,
             indep_qiskit_compiler=indep_qiskit_compiler,
             indep_tket_compiler=indep_tket_compiler,
+            nativegates_bqskit_compiler=nativegates_bqskit_compiler,
             nativegates_qiskit_compiler=nativegates_qiskit_compiler,
             nativegates_tket_compiler=nativegates_tket_compiler,
+            native_bqskit_opt_lvls=native_bqskit_opt_lvls,
             native_qiskit_opt_lvls=native_qiskit_opt_lvls,
             native_gatesets=native_gatesets,
+            mapped_bqskit_compiler=mapped_bqskit_compiler,
             mapped_qiskit_compiler=mapped_qiskit_compiler,
             mapped_tket_compiler=mapped_tket_compiler,
+            mapped_bqskit_opt_lvls=mapped_bqskit_opt_lvls,
             mapped_qiskit_opt_lvls=mapped_qiskit_opt_lvls,
             mapped_tket_placements=mapped_tket_placements,
             mapped_devices=mapped_devices,
diff --git a/tests/test_benchviewer.py b/tests/test_benchviewer.py
index bc77b8965..a0fd4c883 100644
--- a/tests/test_benchviewer.py
+++ b/tests/test_benchviewer.py
@@ -174,8 +174,14 @@ def test_prepare_form_input() -> None:
         "selectBench_26": "Routing",
         "selectBench_27": "Shor's",
         "selectBench_28": "Travelling Salesman",
+        "indep_bqskit_compiler": "true",
         "indep_qiskit_compiler": "true",
         "indep_tket_compiler": "true",
+        "nativegates_bqskit_compiler": "true",
+        "nativegates_bqskit_compiler_opt1": "true",
+        "nativegates_bqskit_compiler_opt2": "true",
+        "nativegates_bqskit_compiler_opt3": "true",
+        "nativegates_bqskit_compiler_opt4": "true",
         "nativegates_qiskit_compiler": "true",
         "nativegates_qiskit_compiler_opt0": "true",
         "nativegates_qiskit_compiler_opt1": "true",
@@ -187,6 +193,11 @@ def test_prepare_form_input() -> None:
         "nativegates_oqc": "true",
         "nativegates_ionq": "true",
         "nativegates_quantinuum": "true",
+        "mapped_bqskit_compiler": "true",
+        "mapped_bqskit_compiler_opt1": "true",
+        "mapped_bqskit_compiler_opt2": "true",
+        "mapped_bqskit_compiler_opt3": "true",
+        "mapped_bqskit_compiler_opt4": "true",
         "mapped_qiskit_compiler": "true",
         "mapped_qiskit_compiler_opt0": "true",
         "mapped_qiskit_compiler_opt1": "true",
@@ -208,12 +219,17 @@ def test_prepare_form_input() -> None:
         min_qubits=75,
         max_qubits=110,
         indices_benchmarks=list(range(1, 29)),
+        indep_bqskit_compiler=True,
         indep_qiskit_compiler=True,
         indep_tket_compiler=True,
+        nativegates_bqskit_compiler=True,
+        native_bqskit_opt_lvls=[1, 2, 3, 4],
         nativegates_qiskit_compiler=True,
         native_qiskit_opt_lvls=[0, 1, 2, 3],
         nativegates_tket_compiler=True,
         native_gatesets=["ibm", "rigetti", "oqc", "ionq", "quantinuum"],
+        mapped_bqskit_compiler=True,
+        mapped_bqskit_opt_lvls=[1, 2, 3, 4],
         mapped_qiskit_compiler=True,
         mapped_qiskit_opt_lvls=[0, 1, 2, 3],
         mapped_tket_compiler=True,
@@ -235,8 +251,14 @@ def test_prepare_form_input() -> None:
         "all_benchmarks": "true",
         "minQubits": "75",
         "maxQubits": "110",
+        "indep_bqskit_compiler": "true",
         "indep_qiskit_compiler": "true",
         "indep_tket_compiler": "true",
+        "nativegates_bqskit_compiler": "true",
+        "nativegates_bqskit_compiler_opt1": "true",
+        "nativegates_bqskit_compiler_opt2": "true",
+        "nativegates_bqskit_compiler_opt3": "true",
+        "nativegates_bqskit_compiler_opt4": "true",
         "nativegates_qiskit_compiler": "true",
         "nativegates_qiskit_compiler_opt0": "true",
         "nativegates_qiskit_compiler_opt1": "true",
@@ -248,6 +270,11 @@ def test_prepare_form_input() -> None:
         "nativegates_oqc": "true",
         "nativegates_ionq": "true",
         "nativegates_quantinuum": "true",
+        "mapped_bqskit_compiler": "true",
+        "mapped_bqskit_compiler_opt1": "true",
+        "mapped_bqskit_compiler_opt2": "true",
+        "mapped_bqskit_compiler_opt3": "true",
+        "mapped_bqskit_compiler_opt4": "true",
         "mapped_qiskit_compiler": "true",
         "mapped_qiskit_compiler_opt0": "true",
         "mapped_qiskit_compiler_opt1": "true",
@@ -268,13 +295,18 @@ def test_prepare_form_input() -> None:
         min_qubits=75,
         max_qubits=110,
         indices_benchmarks=[],
+        indep_bqskit_compiler=True,
         indep_qiskit_compiler=True,
         indep_tket_compiler=True,
+        nativegates_bqskit_compiler=True,
         nativegates_qiskit_compiler=True,
+        native_bqskit_opt_lvls=[1, 2, 3, 4],
         native_qiskit_opt_lvls=[0, 1, 2, 3],
         nativegates_tket_compiler=True,
         native_gatesets=["ibm", "rigetti", "oqc", "ionq", "quantinuum"],
+        mapped_bqskit_compiler=True,
         mapped_qiskit_compiler=True,
+        mapped_bqskit_opt_lvls=[1, 2, 3, 4],
         mapped_qiskit_opt_lvls=[0, 1, 2, 3],
         mapped_tket_compiler=True,
         mapped_tket_placements=["graph", "line"],
@@ -318,10 +350,13 @@ def test_create_database() -> None:
         min_qubits=2,
         max_qubits=5,
         indices_benchmarks=[4],
+        indep_bqskit_compiler=False,
         indep_qiskit_compiler=True,
         indep_tket_compiler=False,
+        nativegates_bqskit_compiler=False,
         nativegates_qiskit_compiler=False,
         nativegates_tket_compiler=False,
+        mapped_bqskit_compiler=False,
         mapped_qiskit_compiler=False,
         mapped_tket_compiler=False,
     )
@@ -334,10 +369,13 @@ def test_create_database() -> None:
         min_qubits=110,
         max_qubits=120,
         indices_benchmarks=[3],
+        indep_bqskit_compiler=False,
         indep_qiskit_compiler=False,
         indep_tket_compiler=False,
+        nativegates_bqskit_compiler=False,
         nativegates_qiskit_compiler=False,
         nativegates_tket_compiler=True,
+        mapped_bqskit_compiler=False,
         mapped_qiskit_compiler=False,
         mapped_tket_compiler=False,
         native_gatesets=["rigetti", "ionq"],
@@ -350,10 +388,13 @@ def test_create_database() -> None:
         min_qubits=75,
         max_qubits=110,
         indices_benchmarks=[2],
+        indep_bqskit_compiler=False,
         indep_qiskit_compiler=False,
         indep_tket_compiler=False,
+        nativegates_bqskit_compiler=False,
         nativegates_qiskit_compiler=False,
         nativegates_tket_compiler=False,
+        mapped_bqskit_compiler=False,
         mapped_qiskit_compiler=True,
         mapped_tket_compiler=True,
         native_gatesets=["rigetti", "ionq"],
@@ -368,10 +409,13 @@ def test_create_database() -> None:
         min_qubits=2,
         max_qubits=5,
         indices_benchmarks=[23],
+        indep_bqskit_compiler=False,
         indep_qiskit_compiler=True,
         indep_tket_compiler=True,
+        nativegates_bqskit_compiler=False,
         nativegates_qiskit_compiler=True,
         nativegates_tket_compiler=False,
+        mapped_bqskit_compiler=False,
         mapped_qiskit_compiler=True,
         mapped_tket_compiler=True,
         native_gatesets=["rigetti", "ionq", "oqc", "ibm", "quantinuum"],
@@ -395,10 +439,13 @@ def test_create_database() -> None:
         min_qubits=2,
         max_qubits=130,
         indices_benchmarks=[1],
+        indep_bqskit_compiler=False,
         indep_qiskit_compiler=False,
         indep_tket_compiler=False,
+        nativegates_bqskit_compiler=False,
         nativegates_qiskit_compiler=True,
         nativegates_tket_compiler=True,
+        mapped_bqskit_compiler=False,
         mapped_qiskit_compiler=True,
         mapped_tket_compiler=True,
     )

From d7ddcaa837636a61910a70243901c2d5fd313fee Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Tue, 23 Jan 2024 16:52:21 +0100
Subject: [PATCH 06/10] =?UTF-8?q?=E2=9C=A8=20Add=20bqskit=20to=20filter=20?=
 =?UTF-8?q?database?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/backend.py | 58 +++++++++++++++++++++++++++-------
 tests/test_benchviewer.py      |  7 ++++
 2 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/mqt/benchviewer/backend.py b/src/mqt/benchviewer/backend.py
index feced946d..c10d5ecf6 100644
--- a/src/mqt/benchviewer/backend.py
+++ b/src/mqt/benchviewer/backend.py
@@ -188,14 +188,33 @@ def filter_database(self, benchmark_config: BenchmarkConfiguration) -> list[str]
             | (self.database["benchmark"].isin(selected_nonscalable_benchmarks))
         ]
 
-        if benchmark_config.indep_qiskit_compiler:
-            db_tmp1 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "qiskit")]
+        if benchmark_config.indep_tket_compiler:
+            db_tmp1 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "bqskit")]
             db_filtered = pd.concat([db_filtered, db_tmp1])
 
-        if benchmark_config.indep_tket_compiler:
-            db_tmp2 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "tket")]
+        if benchmark_config.indep_qiskit_compiler:
+            db_tmp2 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "qiskit")]
             db_filtered = pd.concat([db_filtered, db_tmp2])
 
+        if benchmark_config.indep_tket_compiler:
+            db_tmp3 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "tket")]
+            db_filtered = pd.concat([db_filtered, db_tmp3])
+
+        if (
+            benchmark_config.nativegates_bqskit_compiler
+            and benchmark_config.native_gatesets
+            and benchmark_config.native_bqskit_opt_lvls
+        ):
+            for gate_set in benchmark_config.native_gatesets:
+                for opt_lvl in benchmark_config.native_bqskit_opt_lvls:
+                    db_tmp4 = db_tmp.loc[
+                        (db_tmp["nativegates_flag"])
+                        & (db_tmp["gate_set"] == gate_set)
+                        & (db_tmp["compiler"] == "bqskit")
+                        & (db_tmp["compiler_settings"] == opt_lvl)
+                    ]
+                    db_filtered = pd.concat([db_filtered, db_tmp4])
+
         if (
             benchmark_config.nativegates_qiskit_compiler
             and benchmark_config.native_gatesets
@@ -203,20 +222,35 @@ def filter_database(self, benchmark_config: BenchmarkConfiguration) -> list[str]
         ):
             for gate_set in benchmark_config.native_gatesets:
                 for opt_lvl in benchmark_config.native_qiskit_opt_lvls:
-                    db_tmp3 = db_tmp.loc[
+                    db_tmp5 = db_tmp.loc[
                         (db_tmp["nativegates_flag"])
                         & (db_tmp["gate_set"] == gate_set)
                         & (db_tmp["compiler"] == "qiskit")
                         & (db_tmp["compiler_settings"] == opt_lvl)
                     ]
-                    db_filtered = pd.concat([db_filtered, db_tmp3])
+                    db_filtered = pd.concat([db_filtered, db_tmp5])
 
         if benchmark_config.nativegates_tket_compiler and benchmark_config.native_gatesets:
             for gate_set in benchmark_config.native_gatesets:
-                db_tmp4 = db_tmp.loc[
+                db_tmp6 = db_tmp.loc[
                     (db_tmp["nativegates_flag"]) & (db_tmp["gate_set"] == gate_set) & (db_tmp["compiler"] == "tket")
                 ]
-                db_filtered = pd.concat([db_filtered, db_tmp4])
+                db_filtered = pd.concat([db_filtered, db_tmp6])
+
+        if (
+            benchmark_config.mapped_bqskit_compiler
+            and benchmark_config.mapped_bqskit_opt_lvls
+            and benchmark_config.mapped_devices
+        ):
+            for opt_lvl in benchmark_config.mapped_bqskit_opt_lvls:
+                for device in benchmark_config.mapped_devices:
+                    db_tmp6 = db_tmp.loc[
+                        (db_tmp["mapped_flag"])
+                        & (db_tmp["target_device"] == device)
+                        & (db_tmp["compiler"] == "bqskit")
+                        & (db_tmp["compiler_settings"] == opt_lvl)
+                    ]
+                    db_filtered = pd.concat([db_filtered, db_tmp6])
 
         if (
             benchmark_config.mapped_qiskit_compiler
@@ -225,13 +259,13 @@ def filter_database(self, benchmark_config: BenchmarkConfiguration) -> list[str]
         ):
             for opt_lvl in benchmark_config.mapped_qiskit_opt_lvls:
                 for device in benchmark_config.mapped_devices:
-                    db_tmp5 = db_tmp.loc[
+                    db_tmp6 = db_tmp.loc[
                         (db_tmp["mapped_flag"])
                         & (db_tmp["target_device"] == device)
                         & (db_tmp["compiler"] == "qiskit")
                         & (db_tmp["compiler_settings"] == opt_lvl)
                     ]
-                    db_filtered = pd.concat([db_filtered, db_tmp5])
+                    db_filtered = pd.concat([db_filtered, db_tmp6])
 
         if (
             benchmark_config.mapped_tket_compiler
@@ -240,13 +274,13 @@ def filter_database(self, benchmark_config: BenchmarkConfiguration) -> list[str]
         ):
             for placement in benchmark_config.mapped_tket_placements:
                 for device in benchmark_config.mapped_devices:
-                    db_tmp6 = db_tmp.loc[
+                    db_tmp7 = db_tmp.loc[
                         (db_tmp["mapped_flag"])
                         & (db_tmp["target_device"] == device)
                         & (db_tmp["compiler"] == "tket")
                         & (db_tmp["compiler_settings"] == placement)
                     ]
-                    db_filtered = pd.concat([db_filtered, db_tmp6])
+                    db_filtered = pd.concat([db_filtered, db_tmp7])
 
         return cast(list[str], db_filtered["filename"].to_list())
 
diff --git a/tests/test_benchviewer.py b/tests/test_benchviewer.py
index a0fd4c883..345dadb03 100644
--- a/tests/test_benchviewer.py
+++ b/tests/test_benchviewer.py
@@ -394,6 +394,7 @@ def test_create_database() -> None:
         nativegates_bqskit_compiler=False,
         nativegates_qiskit_compiler=False,
         nativegates_tket_compiler=False,
+        # TODO: test bqskit once QASM files are generated
         mapped_bqskit_compiler=False,
         mapped_qiskit_compiler=True,
         mapped_tket_compiler=True,
@@ -412,9 +413,11 @@ def test_create_database() -> None:
         indep_bqskit_compiler=False,
         indep_qiskit_compiler=True,
         indep_tket_compiler=True,
+        # TODO: test bqskit once QASM files are generated
         nativegates_bqskit_compiler=False,
         nativegates_qiskit_compiler=True,
         nativegates_tket_compiler=False,
+        # TODO: test bqskit once QASM files are generated
         mapped_bqskit_compiler=False,
         mapped_qiskit_compiler=True,
         mapped_tket_compiler=True,
@@ -428,7 +431,9 @@ def test_create_database() -> None:
             "quantinuum_h2",
         ],
         mapped_tket_placements=["graph", "line"],
+        native_bqskit_opt_lvls=[1, 4],
         native_qiskit_opt_lvls=[0, 3],
+        mapped_bqskit_opt_lvls=[1, 4],
         mapped_qiskit_opt_lvls=[0, 3],
     )
     res = backend.get_selected_file_paths(input_data)
@@ -442,9 +447,11 @@ def test_create_database() -> None:
         indep_bqskit_compiler=False,
         indep_qiskit_compiler=False,
         indep_tket_compiler=False,
+        # TODO: test bqskit once QASM files are generated
         nativegates_bqskit_compiler=False,
         nativegates_qiskit_compiler=True,
         nativegates_tket_compiler=True,
+        # TODO: test bqskit once QASM files are generated
         mapped_bqskit_compiler=False,
         mapped_qiskit_compiler=True,
         mapped_tket_compiler=True,

From b1deb906bf93ea82ca458d1136fa722e08997dca Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Wed, 24 Jan 2024 10:35:10 +0100
Subject: [PATCH 07/10] =?UTF-8?q?=F0=9F=90=9B=20Fix=20bug=20in=20checking?=
 =?UTF-8?q?=20bqskit=20compiler=20flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/backend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mqt/benchviewer/backend.py b/src/mqt/benchviewer/backend.py
index c10d5ecf6..b1e798c4e 100644
--- a/src/mqt/benchviewer/backend.py
+++ b/src/mqt/benchviewer/backend.py
@@ -188,7 +188,7 @@ def filter_database(self, benchmark_config: BenchmarkConfiguration) -> list[str]
             | (self.database["benchmark"].isin(selected_nonscalable_benchmarks))
         ]
 
-        if benchmark_config.indep_tket_compiler:
+        if benchmark_config.indep_bqskit_compiler:
             db_tmp1 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "bqskit")]
             db_filtered = pd.concat([db_filtered, db_tmp1])
 

From d062513c7ea5be13381d7f872369efa4a150b1e0 Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Wed, 24 Jan 2024 10:40:20 +0100
Subject: [PATCH 08/10] =?UTF-8?q?=F0=9F=90=9B=20Rearrange=20order=20of=20c?=
 =?UTF-8?q?ompiler=20options=20indep=20lvl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/templates/index.html | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/mqt/benchviewer/templates/index.html b/src/mqt/benchviewer/templates/index.html
index dafb2c0d5..b2957e712 100644
--- a/src/mqt/benchviewer/templates/index.html
+++ b/src/mqt/benchviewer/templates/index.html
@@ -245,33 +245,32 @@ <h6>Target-independent Level</h6>
                 <input
                   class="form-check-input"
                   type="checkbox"
-                  id="indep_bqskit_compiler"
-                  name="indep_bqskit_compiler"
+                  id="indep_qiskit_compiler"
+                  name="indep_qiskit_compiler"
                   value="true"
                 />
-                <label for="indep_bqskit_compiler">BQSKit</label>
+                <label for="indep_qiskit_compiler">Qiskit</label>
               </div>
 
               <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
-                  id="indep_qiskit_compiler"
-                  name="indep_qiskit_compiler"
+                  id="indep_tket_compiler"
+                  name="indep_tket_compiler"
                   value="true"
                 />
-                <label for="indep_qiskit_compiler">Qiskit</label>
+                <label for="indep_tket_compiler">TKET</label>
               </div>
-
               <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
-                  id="indep_tket_compiler"
-                  name="indep_tket_compiler"
+                  id="indep_bqskit_compiler"
+                  name="indep_bqskit_compiler"
                   value="true"
                 />
-                <label for="indep_tket_compiler">TKET</label>
+                <label for="indep_bqskit_compiler">BQSKit</label>
               </div>
             </div>
           </div>

From 23e7d6af0d6742dfe80a2763629ee7a9875489a8 Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Wed, 24 Jan 2024 10:44:46 +0100
Subject: [PATCH 09/10] =?UTF-8?q?=F0=9F=90=9B=20Rearrange=20order=20of=20c?=
 =?UTF-8?q?ompiler=20options=20in=20native=20gates=20lvl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/templates/index.html | 74 ++++++++++++------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/mqt/benchviewer/templates/index.html b/src/mqt/benchviewer/templates/index.html
index b2957e712..33f5b14c7 100644
--- a/src/mqt/benchviewer/templates/index.html
+++ b/src/mqt/benchviewer/templates/index.html
@@ -347,118 +347,118 @@ <h6>Target-dependent Native Gates Level</h6>
                 <input
                   class="form-check-input"
                   type="checkbox"
-                  onchange="toggleNativeBQSKit()"
-                  id="nativegates_bqskit_compiler"
-                  name="nativegates_bqskit_compiler"
+                  onchange="toggleNativeQiskit()"
+                  id="nativegates_qiskit_compiler"
+                  name="nativegates_qiskit_compiler"
                   value="true"
                 />
-                <label for="nativegates_bqskit_compiler">BQSKit</label>
+                <label for="nativegates_qiskit_compiler">Qiskit</label>
               </div>
 
               <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
-                  onchange="toggleNativeQiskit()"
-                  id="nativegates_qiskit_compiler"
-                  name="nativegates_qiskit_compiler"
+                  id="nativegates_tket_compiler"
+                  name="nativegates_tket_compiler"
                   value="true"
                 />
-                <label for="nativegates_qiskit_compiler">Qiskit</label>
+                <label for="nativegates_tket_compiler">TKET</label>
               </div>
 
               <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
-                  id="nativegates_tket_compiler"
-                  name="nativegates_tket_compiler"
+                  onchange="toggleNativeBQSKit()"
+                  id="nativegates_bqskit_compiler"
+                  name="nativegates_bqskit_compiler"
                   value="true"
                 />
-                <label for="nativegates_tket_compiler">TKET</label>
+                <label for="nativegates_bqskit_compiler">BQSKit</label>
               </div>
             </div>
             <p class="text-justify" style="margin: 0px; margin-top: 15px">
-              If BQSKit is selected, select its optimization level:
+              If Qiskit is selected, select its optimization level:
             </p>
             <div class="col-md-12 align-items-center">
               <input
                 class="form-check-input"
                 type="checkbox"
-                name="nativegates_bqskit_compiler_opt1"
+                name="nativegates_qiskit_compiler_opt0"
                 value="true"
-                id="nativegates_bqskit_compiler_opt1"
+                id="nativegates_qiskit_compiler_opt0"
                 disabled
               />
-              <label for="nativegates_bqskit_compiler_opt1">Opt. 1</label>
+              <label for="nativegates_qiskit_compiler_opt0">Opt. 0</label>
               <input
                 class="form-check-input"
                 type="checkbox"
-                name="nativegates_bqskit_compiler_opt2"
+                name="nativegates_qiskit_compiler_opt1"
                 value="true"
-                id="nativegates_bqskit_compiler_opt2"
+                id="nativegates_qiskit_compiler_opt1"
                 disabled
               />
-              <label for="nativegates_bqskit_compiler_opt2">Opt. 2</label>
+              <label for="nativegates_qiskit_compiler_opt1">Opt. 1</label>
               <input
                 class="form-check-input"
                 type="checkbox"
-                name="nativegates_bqskit_compiler_opt3"
+                name="nativegates_qiskit_compiler_opt2"
                 value="true"
-                id="nativegates_bqskit_compiler_opt3"
+                id="nativegates_qiskit_compiler_opt2"
                 disabled
               />
-              <label for="nativegates_bqskit_compiler_opt3">Opt. 3</label>
+              <label for="nativegates_qiskit_compiler_opt2">Opt. 2</label>
               <input
                 class="form-check-input"
                 type="checkbox"
-                name="nativegates_bqskit_compiler_opt4"
+                name="nativegates_qiskit_compiler_opt3"
                 value="true"
-                id="nativegates_bqskit_compiler_opt4"
+                id="nativegates_qiskit_compiler_opt3"
                 disabled
               />
-              <label for="nativegates_bqskit_compiler_opt4">Opt. 4</label>
+              <label for="nativegates_qiskit_compiler_opt3">Opt. 3</label>
             </div>
             <p class="text-justify" style="margin: 0px; margin-top: 15px">
-              If Qiskit is selected, select its optimization level:
+              If BQSKit is selected, select its optimization level:
             </p>
             <div class="col-md-12 align-items-center">
               <input
                 class="form-check-input"
                 type="checkbox"
-                name="nativegates_qiskit_compiler_opt0"
+                name="nativegates_bqskit_compiler_opt1"
                 value="true"
-                id="nativegates_qiskit_compiler_opt0"
+                id="nativegates_bqskit_compiler_opt1"
                 disabled
               />
-              <label for="nativegates_qiskit_compiler_opt0">Opt. 0</label>
+              <label for="nativegates_bqskit_compiler_opt1">Opt. 1</label>
               <input
                 class="form-check-input"
                 type="checkbox"
-                name="nativegates_qiskit_compiler_opt1"
+                name="nativegates_bqskit_compiler_opt2"
                 value="true"
-                id="nativegates_qiskit_compiler_opt1"
+                id="nativegates_bqskit_compiler_opt2"
                 disabled
               />
-              <label for="nativegates_qiskit_compiler_opt1">Opt. 1</label>
+              <label for="nativegates_bqskit_compiler_opt2">Opt. 2</label>
               <input
                 class="form-check-input"
                 type="checkbox"
-                name="nativegates_qiskit_compiler_opt2"
+                name="nativegates_bqskit_compiler_opt3"
                 value="true"
-                id="nativegates_qiskit_compiler_opt2"
+                id="nativegates_bqskit_compiler_opt3"
                 disabled
               />
-              <label for="nativegates_qiskit_compiler_opt2">Opt. 2</label>
+              <label for="nativegates_bqskit_compiler_opt3">Opt. 3</label>
               <input
                 class="form-check-input"
                 type="checkbox"
-                name="nativegates_qiskit_compiler_opt3"
+                name="nativegates_bqskit_compiler_opt4"
                 value="true"
-                id="nativegates_qiskit_compiler_opt3"
+                id="nativegates_bqskit_compiler_opt4"
                 disabled
               />
-              <label for="nativegates_qiskit_compiler_opt3">Opt. 3</label>
+              <label for="nativegates_bqskit_compiler_opt4">Opt. 4</label>
             </div>
           </div>
 

From dd2c8e136d8ba6bb2627a8b0c80b5f1051e7e07b Mon Sep 17 00:00:00 2001
From: Jagatheesan <jagandecapri@gmail.com>
Date: Wed, 24 Jan 2024 10:50:31 +0100
Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=90=9B=20Rearrange=20order=20of=20c?=
 =?UTF-8?q?ompiler=20options=20mapped=20lvl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mqt/benchviewer/templates/index.html | 96 ++++++++++++------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/mqt/benchviewer/templates/index.html b/src/mqt/benchviewer/templates/index.html
index 33f5b14c7..17ef0e8ea 100644
--- a/src/mqt/benchviewer/templates/index.html
+++ b/src/mqt/benchviewer/templates/index.html
@@ -561,17 +561,6 @@ <h6>Target-dependent Mapped Level</h6>
               Select the used compiler:
             </p>
             <div class="d-flex">
-              <div class="col-md-4 align-items-center">
-                <input
-                  class="form-check-input"
-                  type="checkbox"
-                  value="true"
-                  onchange="toggleMappedBQSKit()"
-                  id="mapped_bqskit_compiler"
-                  name="mapped_bqskit_compiler"
-                />
-                <label for="mapped_bqskit_compiler">BQSKit</label>
-              </div>
               <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
@@ -594,48 +583,16 @@ <h6>Target-dependent Mapped Level</h6>
                 />
                 <label for="mapped_tket_compiler">TKET</label>
               </div>
-            </div>
-            <div class="row">
-              <p class="text-justify" style="margin: 0px; margin-top: 15px">
-                If BQSKit is selected, select its optimization level:
-              </p>
-              <div class="col-md-12 align-items-center">
-                <input
-                  class="form-check-input"
-                  type="checkbox"
-                  value="true"
-                  disabled
-                  id="mapped_bqskit_compiler_opt1"
-                  name="mapped_bqskit_compiler_opt1"
-                />
-                <label for="mapped_bqskit_compiler_opt1">Opt. 1</label>
-                <input
-                  class="form-check-input"
-                  type="checkbox"
-                  value="true"
-                  disabled
-                  id="mapped_bqskit_compiler_opt2"
-                  name="mapped_bqskit_compiler_opt2"
-                />
-                <label for="mapped_bqskit_compiler_opt2">Opt. 2</label>
-                <input
-                  class="form-check-input"
-                  type="checkbox"
-                  value="true"
-                  disabled
-                  id="mapped_bqskit_compiler_opt3"
-                  name="mapped_bqskit_compiler_opt3"
-                />
-                <label for="mapped_bqskit_compiler_opt3">Opt. 3</label>
+              <div class="col-md-4 align-items-center">
                 <input
                   class="form-check-input"
                   type="checkbox"
                   value="true"
-                  disabled
-                  id="mapped_bqskit_compiler_opt4"
-                  name="mapped_bqskit_compiler_opt4"
+                  onchange="toggleMappedBQSKit()"
+                  id="mapped_bqskit_compiler"
+                  name="mapped_bqskit_compiler"
                 />
-                <label for="mapped_bqskit_compiler_opt4">Opt. 4</label>
+                <label for="mapped_bqskit_compiler">BQSKit</label>
               </div>
             </div>
             <div class="row">
@@ -703,6 +660,49 @@ <h6>Target-dependent Mapped Level</h6>
                 />
                 <label for="mapped_tket_compiler_line">Line Placement </label>
               </div>
+              <div class="row">
+                <p class="text-justify" style="margin: 0px; margin-top: 15px">
+                  If BQSKit is selected, select its optimization level:
+                </p>
+                <div class="col-md-12 align-items-center">
+                  <input
+                    class="form-check-input"
+                    type="checkbox"
+                    value="true"
+                    disabled
+                    id="mapped_bqskit_compiler_opt1"
+                    name="mapped_bqskit_compiler_opt1"
+                  />
+                  <label for="mapped_bqskit_compiler_opt1">Opt. 1</label>
+                  <input
+                    class="form-check-input"
+                    type="checkbox"
+                    value="true"
+                    disabled
+                    id="mapped_bqskit_compiler_opt2"
+                    name="mapped_bqskit_compiler_opt2"
+                  />
+                  <label for="mapped_bqskit_compiler_opt2">Opt. 2</label>
+                  <input
+                    class="form-check-input"
+                    type="checkbox"
+                    value="true"
+                    disabled
+                    id="mapped_bqskit_compiler_opt3"
+                    name="mapped_bqskit_compiler_opt3"
+                  />
+                  <label for="mapped_bqskit_compiler_opt3">Opt. 3</label>
+                  <input
+                    class="form-check-input"
+                    type="checkbox"
+                    value="true"
+                    disabled
+                    id="mapped_bqskit_compiler_opt4"
+                    name="mapped_bqskit_compiler_opt4"
+                  />
+                  <label for="mapped_bqskit_compiler_opt4">Opt. 4</label>
+                </div>
+              </div>
             </div>
           </div>
         </div>