Configure HloPjRtTestBase with new option structs.

A struct instead of optional parameters make it easier for us to express
different test setups. In most applications we expect the default values to
suffice.

PiperOrigin-RevId: 706083556

xla/tests/hlo_pjrt_test_base.cc

@@ -66,12 +66,11 @@ std::unique_ptr<HloRunnerInterface> GetHloRunnerForReference() {
 
 }  // namespace
 
-HloPjRtTestBase::HloPjRtTestBase(
-    bool verifier_layout_sensitive, bool allow_mixed_precision_in_hlo_verifier,
-    HloPredicate instruction_can_change_layout_func)
-    : HloRunnerAgnosticTestBase(
-          GetHloRunnerForTest(), GetHloRunnerForReference(),
-          verifier_layout_sensitive, allow_mixed_precision_in_hlo_verifier,
-          instruction_can_change_layout_func) {}
+HloPjRtTestBase::HloPjRtTestBase(HloPjRtTestBaseOptions options)
+    : HloRunnerAgnosticTestBase(GetHloRunnerForTest(),
+                                GetHloRunnerForReference(),
+                                options.verifier_layout_sensitive,
+                                options.allow_mixed_precision_in_hlo_verifier,
+                                options.instruction_can_change_layout_func) {}
 
 }  // namespace xla

xla/tests/hlo_pjrt_test_base.h

@@ -22,14 +22,17 @@ limitations under the License.
 
 namespace xla {
 
+struct HloPjRtTestBaseOptions {
+  bool verifier_layout_sensitive = false;
+  bool allow_mixed_precision_in_hlo_verifier = true;
+  HloPredicate instruction_can_change_layout_func;
+};
+
 class HloPjRtTestBase : public HloRunnerAgnosticTestBase {
  protected:
   // This uses the SE interpreter backend for the reference backend and
   // automatically finds a PjRt backend for the test backend.
-  explicit HloPjRtTestBase(
-      bool verifier_layout_sensitive = false,
-      bool allow_mixed_precision_in_hlo_verifier = true,
-      HloPredicate instruction_can_change_layout_func = {});
+  explicit HloPjRtTestBase(HloPjRtTestBaseOptions options = {});
 };
 
 }  // namespace xla