[DSLX fuzz testing] In preparation for propagating DSLX fuzztest domains

from the .x file to the IR, refactor Attribute kind and arguments
to a shared place. This will be re-used in the IR eventually.

PiperOrigin-RevId: 885171285

Author: dplassgit

xls/common/BUILD

@@ -34,6 +34,12 @@ package(
     licenses = ["notice"],  # Apache 2.0
 )
 
+cc_library(
+    name = "attribute_data",
+    srcs = ["attribute_data.cc"],
+    hdrs = ["attribute_data.h"],
+)
+
 cc_library(
     name = "timeout_support",
     srcs = ["timeout_support.cc"],

xls/common/attribute_data.cc

@@ -0,0 +1,44 @@
+// Copyright 2026 The XLS Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "xls/common/attribute_data.h"
+
+#include <string>
+
+namespace xls {
+
+std::string AttributeKindToString(AttributeKind kind) {
+  switch (kind) {
+    case AttributeKind::kCfg:
+      return "cfg";
+    case AttributeKind::kDerive:
+      return "derive";
+    case AttributeKind::kDslxFormatDisable:
+      return "dslx_format_disable";
+    case AttributeKind::kExternVerilog:
+      return "extern_verilog";
+    case AttributeKind::kSvType:
+      return "sv_type";
+    case AttributeKind::kTest:
+      return "test";
+    case AttributeKind::kTestProc:
+      return "test_proc";
+    case AttributeKind::kQuickcheck:
+      return "quickcheck";
+    case AttributeKind::kChannelStrictness:
+      return "channel_strictness";
+  }
+}
+
+}  // namespace xls

xls/common/attribute_data.h

@@ -0,0 +1,71 @@
+// Copyright 2026 The XLS Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef XLS_COMMON_ATTRIBUTE_DATA_H_
+#define XLS_COMMON_ATTRIBUTE_DATA_H_
+
+#include <cstdint>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
+
+namespace xls {
+
+enum class AttributeKind : uint8_t {
+  kCfg,
+  kDerive,
+  kDslxFormatDisable,
+  kExternVerilog,
+  kSvType,
+  kTest,
+  kTestProc,
+  kQuickcheck,
+  kChannelStrictness
+};
+
+std::string AttributeKindToString(AttributeKind kind);
+
+class AttributeData {
+ public:
+  using StringKeyValueArgument = std::pair<std::string, std::string>;
+  using IntKeyValueArgument = std::pair<std::string, int64_t>;
+
+  // Represents a quoted string argument as opposed to a bare identifier-like
+  // string.
+  struct StringLiteralArgument {
+    std::string text;
+  };
+
+  // Note that a std::string argument is the simplest kind and looks like an
+  // unquoted identifier, like `test` in `#[cfg(test)]`.
+  using Argument = std::variant<std::string, StringLiteralArgument,
+                                StringKeyValueArgument, IntKeyValueArgument>;
+
+  AttributeData(AttributeKind kind, std::vector<Argument> args)
+      : kind_(kind), args_(std::move(args)) {}
+
+  AttributeData(const AttributeData& other) = default;
+
+  AttributeKind kind() const { return kind_; }
+  const std::vector<Argument>& args() const { return args_; }
+
+ private:
+  const AttributeKind kind_;
+  const std::vector<Argument> args_;
+};
+
+}  // namespace xls
+
+#endif  // XLS_COMMON_ATTRIBUTE_DATA_H_

xls/dslx/fmt/BUILD

@@ -65,6 +65,7 @@ cc_library(
         ":comments",
         ":format_disabler",
         ":pretty_print",
+        "//xls/common:attribute_data",
         "//xls/common:visitor",
         "//xls/common/status:ret_check",
         "//xls/common/status:status_macros",

xls/dslx/fmt/ast_fmt.cc

@@ -40,6 +40,7 @@
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
 #include "cppitertools/enumerate.hpp"
+#include "xls/common/attribute_data.h"
 #include "xls/common/status/ret_check.h"
 #include "xls/common/status/status_macros.h"
 #include "xls/common/visitor.h"
@@ -465,19 +466,19 @@ DocRef FmtAttribute(const Attribute& attribute, DocArena& arena) {
 
   if (!attribute.args().empty()) {
     pieces.push_back(arena.oparen());
-    for (const Attribute::Argument& arg : attribute.args()) {
+    for (const AttributeData::Argument& arg : attribute.args()) {
       absl::visit(
           Visitor{
               [&](std::string str) { pieces.push_back(arena.MakeText(str)); },
-              [&](Attribute::StringLiteralArgument arg) {
+              [&](AttributeData::StringLiteralArgument arg) {
                 pieces.push_back(
                     arena.MakeText(absl::Substitute("\"$0\"", arg.text)));
               },
-              [&](Attribute::IntKeyValueArgument arg) {
+              [&](AttributeData::IntKeyValueArgument arg) {
                 pieces.push_back(arena.MakeText(
                     absl::Substitute("$0=$1", arg.first, arg.second)));
               },
-              [&](Attribute::StringKeyValueArgument arg) {
+              [&](AttributeData::StringKeyValueArgument arg) {
                 pieces.push_back(arena.MakeText(
                     absl::Substitute("$0=$1", arg.first, arg.second)));
               },

xls/dslx/frontend/BUILD

@@ -39,6 +39,7 @@ cc_library(
         ":module",
         ":pos",
         ":proc",
+        "//xls/common:attribute_data",
         "//xls/common:visitor",
         "//xls/common/status:ret_check",
         "//xls/common/status:status_macros",
@@ -164,6 +165,7 @@ cc_library(
         ":scanner",
         ":token",
         ":token_parser",
+        "//xls/common:attribute_data",
         "//xls/common:strong_int",
         "//xls/common:visitor",
         "//xls/common/status:ret_check",
@@ -235,6 +237,7 @@ cc_library(
         ":module",
         ":pos",
         ":token_utils",
+        "//xls/common:attribute_data",
         "//xls/common:visitor",
         "//xls/common/status:ret_check",
         "//xls/common/status:status_macros",
@@ -486,6 +489,7 @@ cc_library(
         ":ast_node",
         ":pos",
         ":token_utils",
+        "//xls/common:attribute_data",
         "//xls/common:indent",
         "//xls/common:visitor",
         "//xls/common/status:ret_check",

xls/dslx/frontend/ast.cc

@@ -43,6 +43,7 @@
 #include "absl/strings/substitute.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
+#include "xls/common/attribute_data.h"
 #include "xls/common/indent.h"
 #include "xls/common/status/ret_check.h"
 #include "xls/common/status/status_macros.h"
@@ -639,51 +640,31 @@ std::string BinopKindToString(BinopKind kind) {
   return absl::StrFormat("<invalid BinopKind(%d)>", static_cast<int>(kind));
 }
 
-std::string AttributeKindToString(AttributeKind kind) {
-  switch (kind) {
-    case AttributeKind::kCfg:
-      return "cfg";
-    case AttributeKind::kDerive:
-      return "derive";
-    case AttributeKind::kDslxFormatDisable:
-      return "dslx_format_disable";
-    case AttributeKind::kExternVerilog:
-      return "extern_verilog";
-    case AttributeKind::kSvType:
-      return "sv_type";
-    case AttributeKind::kTest:
-      return "test";
-    case AttributeKind::kTestProc:
-      return "test_proc";
-    case AttributeKind::kQuickcheck:
-      return "quickcheck";
-    case AttributeKind::kChannelStrictness:
-      return "channel_strictness";
-  }
-}
-
 // -- class Attribute
 
 std::string Attribute::ToString() const {
   std::string args;
-  if (!args_.empty()) {
+  if (!attribute_data_.args().empty()) {
     absl::StrAppend(&args, "(");
-    for (Argument next : args_) {
+    for (const AttributeData::Argument& next : attribute_data_.args()) {
       absl::StrAppend(
           &args,
           absl::visit(Visitor{
                           [](auto arg) {
                             return absl::Substitute("$0 = $1", arg.first,
                                                     arg.second);
                           },
-                          [](StringLiteralArgument arg) { return arg.text; },
-                          [](std::string arg) { return arg; },
+                          [](const AttributeData::StringLiteralArgument& arg) {
+                            return arg.text;
+                          },
+                          [](const std::string& arg) { return arg; },
                       },
                       next));
     }
     absl::StrAppend(&args, ")");
   }
-  return absl::Substitute("#[$0$1]", AttributeKindToString(kind_), args);
+  return absl::Substitute("#[$0$1]",
+                          AttributeKindToString(attribute_data_.kind()), args);
 }
 
 // -- class NameDef

xls/dslx/frontend/ast.h

@@ -38,6 +38,7 @@
 #include "absl/strings/str_format.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
+#include "xls/common/attribute_data.h"  // IWYU pragma: keep
 #include "xls/common/status/status_macros.h"
 #include "xls/dslx/channel_direction.h"
 #include "xls/dslx/frontend/ast_node.h"  // IWYU pragma: export
@@ -321,47 +322,18 @@ enum class TypeAnnotationKind : uint8_t {
   kTypeVariable
 };
 
-enum class AttributeKind : uint8_t {
-  kCfg,
-  kDerive,
-  kDslxFormatDisable,
-  kExternVerilog,
-  kSvType,
-  kTest,
-  kTestProc,
-  kQuickcheck,
-  kChannelStrictness
-};
-
-std::string AttributeKindToString(AttributeKind kind);
-
 // One of the `#[foo]`-like nodes preceding some entity.
 class Attribute : public AstNode {
  public:
-  using StringKeyValueArgument = std::pair<std::string, std::string>;
-  using IntKeyValueArgument = std::pair<std::string, int64_t>;
-
-  // Represents a quoted string argument as opposed to a bare identifier-like
-  // string.
-  struct StringLiteralArgument {
-    std::string text;
-  };
-
-  // Note that a std::string argument is the simplest kind and looks like an
-  // unquoted identifier, like `test` in `#[cfg(test)]`.
-  using Argument = std::variant<std::string, StringLiteralArgument,
-                                StringKeyValueArgument, IntKeyValueArgument>;
-
   Attribute(Module* owner, Span span, std::optional<Span> arg_span,
-            AttributeKind kind, std::vector<Argument> args)
+            AttributeData attribute_data)
       : AstNode(owner),
         span_(span),
         arg_span_(arg_span),
-        kind_(kind),
-        args_(std::move(args)) {}
+        attribute_data_(std::move(attribute_data)) {}
 
   AstNodeKind kind() const override { return AstNodeKind::kAttribute; }
-  AttributeKind attribute_kind() const { return kind_; }
+  AttributeKind attribute_kind() const { return attribute_data_.kind(); }
 
   std::optional<Span> GetSpan() const override { return span_; }
   std::optional<Span> GetArgSpan() const { return arg_span_; }
@@ -371,7 +343,10 @@ class Attribute : public AstNode {
   }
 
   std::string_view GetNodeTypeName() const override { return "Attribute"; }
-  const std::vector<Argument>& args() const { return args_; }
+  const AttributeData& attribute_data() const { return attribute_data_; }
+  const std::vector<AttributeData::Argument>& args() const {
+    return attribute_data_.args();
+  }
 
   std::vector<AstNode*> GetChildren(bool want_types) const override {
     return {};
@@ -382,8 +357,7 @@ class Attribute : public AstNode {
  private:
   const Span span_;
   const std::optional<Span> arg_span_;
-  const AttributeKind kind_;
-  const std::vector<Argument> args_;
+  const AttributeData attribute_data_;
 };
 
 // Abstract base class for type annotations.

xls/dslx/frontend/ast_cloner.cc

@@ -31,6 +31,7 @@
 #include "absl/strings/str_format.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
+#include "xls/common/attribute_data.h"
 #include "xls/common/status/ret_check.h"
 #include "xls/common/status/status_macros.h"
 #include "xls/common/visitor.h"
@@ -87,7 +88,7 @@ class AstCloner : public AstNodeVisitor {
     XLS_RETURN_IF_ERROR(VisitChildren(n));
 
     old_to_new_[n] = module(n)->Make<Attribute>(*n->GetSpan(), n->GetArgSpan(),
-                                                n->attribute_kind(), n->args());
+                                                n->attribute_data());
     return absl::OkStatus();
   }
 

xls/dslx/frontend/ast_utils.cc

@@ -34,6 +34,7 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/variant.h"
+#include "xls/common/attribute_data.h"
 #include "xls/common/status/ret_check.h"
 #include "xls/common/status/status_macros.h"
 #include "xls/common/visitor.h"