Remove --baseline-name command line option per feedback

The baseline should be read from the scraped object file, not passed as
a command line argument. Reverted changes that added the --baseline-name
option and removed associated tests.

Co-authored-by: max-charlamb <[email protected]>

Author: Copilot

src/coreclr/clrdatadescriptors.cmake

@@ -59,7 +59,7 @@ function(generate_data_descriptors)
     add_custom_command(
       OUTPUT "${CONTRACT_DESCRIPTOR_OUTPUT}"
       VERBATIM
-      COMMAND ${CLR_DOTNET_HOST_PATH} ${CDAC_BUILD_TOOL_BINARY_PATH} compose -i "${CONTRACT_DESCRIPTOR_INPUT}" -o "${CONTRACT_DESCRIPTOR_OUTPUT}" -b "${CONTRACT_BASELINE_DIR}" --baseline-name empty $<TARGET_OBJECTS:${INTERMEDIARY_LIBRARY}>
+      COMMAND ${CLR_DOTNET_HOST_PATH} ${CDAC_BUILD_TOOL_BINARY_PATH} compose -i "${CONTRACT_DESCRIPTOR_INPUT}" -o "${CONTRACT_DESCRIPTOR_OUTPUT}" -b "${CONTRACT_BASELINE_DIR}" $<TARGET_OBJECTS:${INTERMEDIARY_LIBRARY}>
       DEPENDS ${INTERMEDIARY_LIBRARY} ${DATA_DESCRIPTORS_DEPENDENCIES} $<TARGET_OBJECTS:${INTERMEDIARY_LIBRARY}> "${CONTRACT_DESCRIPTOR_INPUT}"
       USES_TERMINAL
     )

src/coreclr/tools/cdac-build-tool/ComposeCommand.cs

@@ -13,7 +13,6 @@ internal sealed class ComposeCommand : Command
     private readonly Argument<string[]> inputFiles = new("INPUT [INPUTS...]") { Arity = ArgumentArity.OneOrMore, Description = "One or more input files" };
     private readonly Option<string> outputFile = new("-o") { Arity = ArgumentArity.ExactlyOne, HelpName = "OUTPUT", Required = true, Description = "Output file" };
     private readonly Option<string> baselinePath = new("-b", "--baseline") { Arity = ArgumentArity.ExactlyOne, HelpName = "BASELINEPATH", Description = "Directory containing the baseline contracts"};
-    private readonly Option<string?> baselineName = new("--baseline-name") { Arity = ArgumentArity.ZeroOrOne, HelpName = "BASELINENAME", Description = "Name of the baseline to use (optional, overrides baseline from input files)" };
     private readonly Option<string> templateFile = new("-i", "--input-template") { Arity = ArgumentArity.ExactlyOne, HelpName = "TEMPLATE", Description = "Contract descriptor template to be filled in" };
     private readonly Option<bool> _verboseOption;
     public ComposeCommand(Option<bool> verboseOption) : base("compose")
@@ -22,7 +21,6 @@ public ComposeCommand(Option<bool> verboseOption) : base("compose")
         Add(inputFiles);
         Add(outputFile);
         Add(baselinePath);
-        Add(baselineName);
         Add(templateFile);
         SetAction(Run);
     }
@@ -66,8 +64,7 @@ private async Task<int> Run(ParseResult parse, CancellationToken token = default
             return 1;
         }
         var verbose = parse.GetValue(_verboseOption);
-        var baselineNameValue = parse.GetValue(baselineName);
-        var builder = new DataDescriptorModel.Builder(baselinesDir, baselineNameValue);
+        var builder = new DataDescriptorModel.Builder(baselinesDir);
         var scraper = new ObjectFileScraper(verbose, builder);
         foreach (var input in inputs)
         {

src/coreclr/tools/cdac-build-tool/DataDescriptorModel.cs

@@ -84,7 +84,6 @@ internal void DumpModel()
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         DictionaryKeyPolicy = null, // leave unchanged
     };
-
     public string ToJson()
     {
         // always writes the "compact" format, see data_descriptor.md
@@ -96,19 +95,15 @@ public class Builder
         private string _baseline;
         private readonly string _baselinesDir;
         private bool _baselineParsed;
-        private readonly string? _overrideBaselineName;
         private readonly Dictionary<string, TypeModelBuilder> _types = new();
         private readonly Dictionary<string, GlobalBuilder> _globals = new();
         private readonly Dictionary<string, GlobalBuilder> _subDescriptors = new();
         private readonly Dictionary<string, ContractBuilder> _contracts = new();
-        private DataDescriptorModel? _baselineModel;
-
-        public Builder(string baselinesDir, string? overrideBaselineName = null)
+        public Builder(string baselinesDir)
         {
             _baseline = string.Empty;
             _baselineParsed = false;
             _baselinesDir = baselinesDir;
-            _overrideBaselineName = overrideBaselineName;
         }
 
         public uint PlatformFlags {get; set;}
@@ -172,12 +167,6 @@ public void AddOrUpdateContract(string name, int version)
 
         public void SetBaseline(string baseline)
         {
-            // If an override baseline name was provided via command line, use it instead
-            if (_overrideBaselineName is not null)
-            {
-                baseline = _overrideBaselineName;
-            }
-
             if (_baseline != string.Empty && _baseline != baseline)
             {
                 throw new InvalidOperationException($"Baseline already set to {_baseline} cannot set to {baseline}");
@@ -201,54 +190,20 @@ public void SetBaseline(string baseline)
 
         private void ParseBaseline()
         {
-            // Load the baseline file to check if it's empty
-            var baselinePath = Path.Combine(_baselinesDir, _baseline + ".jsonc");
-            if (!File.Exists(baselinePath))
-            {
-                baselinePath = Path.Combine(_baselinesDir, _baseline + ".json");
-                if (!File.Exists(baselinePath))
-                {
-                    throw new InvalidOperationException($"Baseline file not found: {_baseline}.json or {_baseline}.jsonc in {_baselinesDir}");
-                }
-            }
-
-            var json = File.ReadAllText(baselinePath);
-
-            // Check if this is an empty baseline (version 0 with no data)
-            using var doc = JsonDocument.Parse(json, new JsonDocumentOptions
+            if (_baseline != "empty")
             {
-                CommentHandling = JsonCommentHandling.Skip,
-                AllowTrailingCommas = true
-            });
-
-            if (doc.RootElement.TryGetProperty("version", out var versionProp) &&
-                versionProp.GetInt32() == 0)
-            {
-                // Empty baseline - no types, globals, or contracts to load
-                _baselineModel = null;
-                return;
+                throw new InvalidOperationException("TODO: [cdac] - implement baseline parsing");
             }
-
-            // TODO: [cdac] - implement non-empty baseline parsing
-            // For now, we only support empty baselines (version 0) which contain no data
-            // Future work: Add proper JSON deserialization for non-empty baselines
-            // This would require custom JsonConverters for the compact array format used
-            // in baseline files (e.g., "Field1": [0, "uint32"] instead of expanded objects)
-            throw new InvalidOperationException($"Non-empty baseline parsing is not yet implemented for baseline '{_baseline}'. Only empty baselines (version 0) are currently supported.");
         }
 
         public DataDescriptorModel Build()
         {
             var types = new Dictionary<string, TypeModel>();
-            var globals = new Dictionary<string, GlobalModel>();
-            var subDescriptors = new Dictionary<string, GlobalModel>();
-            var contracts = new Dictionary<string, int>();
-
-            // Build current model
             foreach (var (typeName, typeBuilder) in _types)
             {
                 types[typeName] = typeBuilder.Build(typeName);
             }
+            var globals = new Dictionary<string, GlobalModel>();
             foreach (var (globalName, globalBuilder) in _globals)
             {
                 GlobalValue? v = globalBuilder.Value;
@@ -258,6 +213,7 @@ public DataDescriptorModel Build()
                 }
                 globals[globalName] = new GlobalModel { Type = globalBuilder.Type, Value = v.Value };
             }
+            var subDescriptors = new Dictionary<string, GlobalModel>();
             foreach (var (subDescriptorName, subDescriptorBuilder) in _subDescriptors)
             {
                 GlobalValue? v = subDescriptorBuilder.Value;
@@ -267,118 +223,13 @@ public DataDescriptorModel Build()
                 }
                 subDescriptors[subDescriptorName] = new GlobalModel { Type = subDescriptorBuilder.Type, Value = v.Value };
             }
+            var contracts = new Dictionary<string, int>();
             foreach (var (contractName, contractBuilder) in _contracts)
             {
                 contracts[contractName] = contractBuilder.Build();
             }
-
-            // If we have a baseline model loaded, only include differences
-            // Note: Empty baselines (version 0) set _baselineModel to null, so they result in full model output
-            if (_baselineModel is not null)
-            {
-                types = ComputeTypeDifferences(types, _baselineModel.Types);
-                globals = ComputeGlobalDifferences(globals, _baselineModel.Globals);
-                subDescriptors = ComputeGlobalDifferences(subDescriptors, _baselineModel.SubDescriptors);
-                contracts = ComputeContractDifferences(contracts, _baselineModel.Contracts);
-            }
-
             return new DataDescriptorModel(_baseline, types, globals, subDescriptors, contracts, PlatformFlags);
         }
-
-        private static Dictionary<string, TypeModel> ComputeTypeDifferences(
-            IReadOnlyDictionary<string, TypeModel> current,
-            IReadOnlyDictionary<string, TypeModel> baseline)
-        {
-            var differences = new Dictionary<string, TypeModel>();
-
-            foreach (var (typeName, currentType) in current)
-            {
-                if (!baseline.TryGetValue(typeName, out var baselineType))
-                {
-                    // New type not in baseline
-                    differences[typeName] = currentType;
-                    continue;
-                }
-
-                // Check if type has differences
-                if (!TypesEqual(currentType, baselineType))
-                {
-                    differences[typeName] = currentType;
-                }
-            }
-
-            return differences;
-        }
-
-        private static bool TypesEqual(TypeModel a, TypeModel b)
-        {
-            if (a.Size != b.Size)
-                return false;
-
-            if (a.Fields.Count != b.Fields.Count)
-                return false;
-
-            foreach (var (fieldName, fieldA) in a.Fields)
-            {
-                if (!b.Fields.TryGetValue(fieldName, out var fieldB))
-                    return false;
-
-                if (fieldA.Type != fieldB.Type || fieldA.Offset != fieldB.Offset)
-                    return false;
-            }
-
-            return true;
-        }
-
-        private static Dictionary<string, GlobalModel> ComputeGlobalDifferences(
-            IReadOnlyDictionary<string, GlobalModel> current,
-            IReadOnlyDictionary<string, GlobalModel> baseline)
-        {
-            var differences = new Dictionary<string, GlobalModel>();
-
-            foreach (var (globalName, currentGlobal) in current)
-            {
-                if (!baseline.TryGetValue(globalName, out var baselineGlobal))
-                {
-                    // New global not in baseline
-                    differences[globalName] = currentGlobal;
-                    continue;
-                }
-
-                // Check if global has differences
-                if (currentGlobal.Type != baselineGlobal.Type || currentGlobal.Value != baselineGlobal.Value)
-                {
-                    differences[globalName] = currentGlobal;
-                }
-            }
-
-            return differences;
-        }
-
-        private static Dictionary<string, int> ComputeContractDifferences(
-            IReadOnlyDictionary<string, int> current,
-            IReadOnlyDictionary<string, int> baseline)
-        {
-            var differences = new Dictionary<string, int>();
-
-            foreach (var (contractName, currentVersion) in current)
-            {
-                if (!baseline.TryGetValue(contractName, out var baselineVersion))
-                {
-                    // New contract not in baseline
-                    differences[contractName] = currentVersion;
-                    continue;
-                }
-
-                // Check if version has changed
-                if (currentVersion != baselineVersion)
-                {
-                    differences[contractName] = currentVersion;
-                }
-            }
-
-            return differences;
-        }
     }
 
     public class TypeModelBuilder

src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj

@@ -16,10 +16,6 @@
     <RootNamespace>Microsoft.DotNet.Diagnostics.DataContract</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="tests/**/*.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
   </ItemGroup>