Merge pull request #70 from AlexsanderHamir/refactors

Implements Parts of #67

Author: AlexsanderHamir

cli/helpers.go

@@ -25,8 +25,8 @@ var (
 	count      int
 
 	// Track command flags.
-	baselineTag         string
-	currentTag          string
+	Baseline            string
+	Current             string
 	benchmarkName       string
 	profileType         string
 	outputFormat        string
@@ -117,13 +117,13 @@ func createTrackCmd() *cobra.Command {
 
 func createTrackAutoCmd() *cobra.Command {
 	baseTagFlag := "base"
-	currentTagFlag := "current"
+	currentFlag := "current"
 	benchNameFlag := "bench-name"
 	profileTypeFlag := "profile-type"
 	outputFormatFlag := "output-format"
 	failFlag := "fail-on-regression"
 	thresholdFlag := "regression-threshold"
-	example := fmt.Sprintf(`prof track auto --%s "tag1" --%s "tag2" --%s "cpu" --%s "BenchmarkGenPool" --%s "summary"`, baseTagFlag, currentTagFlag, profileTypeFlag, benchNameFlag, outputFormatFlag)
+	example := fmt.Sprintf(`prof track auto --%s "tag1" --%s "tag2" --%s "cpu" --%s "BenchmarkGenPool" --%s "summary"`, baseTagFlag, currentFlag, profileTypeFlag, benchNameFlag, outputFormatFlag)
 	longExplanation := fmt.Sprintf("This command only works if the %s command was used to collect and organize the benchmark and profile data, as it expects a specific directory structure generated by that process.", internal.AUTOCMD)
 	shortExplanation := "If prof auto was used to collect the data, track auto can be used to analyze it, you just have to pass the tag name."
 
@@ -134,8 +134,8 @@ func createTrackAutoCmd() *cobra.Command {
 		RunE: func(_ *cobra.Command, _ []string) error {
 			selections := &tracker.Selections{
 				OutputFormat:        outputFormat,
-				BaselineTag:         baselineTag,
-				CurrentTag:          currentTag,
+				Baseline:            Baseline,
+				Current:             Current,
 				ProfileType:         profileType,
 				BenchmarkName:       benchmarkName,
 				RegressionThreshold: regressionThreshold,
@@ -146,16 +146,16 @@ func createTrackAutoCmd() *cobra.Command {
 		Example: example,
 	}
 
-	cmd.Flags().StringVar(&baselineTag, baseTagFlag, "", "Name of the baseline tag")
-	cmd.Flags().StringVar(&currentTag, currentTagFlag, "", "Name of the current tag")
+	cmd.Flags().StringVar(&Baseline, baseTagFlag, "", "Name of the baseline tag")
+	cmd.Flags().StringVar(&Current, currentFlag, "", "Name of the current tag")
 	cmd.Flags().StringVar(&benchmarkName, benchNameFlag, "", "Name of the benchmark")
 	cmd.Flags().StringVar(&profileType, profileTypeFlag, "", "Profile type (cpu, memory, mutex, block)")
 	cmd.Flags().StringVar(&outputFormat, outputFormatFlag, "detailed", `Output format: "summary" or "detailed"`)
 	cmd.Flags().BoolVar(&failOnRegression, failFlag, false, "Exit with non-zero code if regression exceeds threshold")
 	cmd.Flags().Float64Var(&regressionThreshold, thresholdFlag, 0.0, "Fail when worst flat regression exceeds this percent (e.g., 5.0)")
 
 	_ = cmd.MarkFlagRequired(baseTagFlag)
-	_ = cmd.MarkFlagRequired(currentTagFlag)
+	_ = cmd.MarkFlagRequired(currentFlag)
 	_ = cmd.MarkFlagRequired(benchNameFlag)
 	_ = cmd.MarkFlagRequired(profileTypeFlag)
 
@@ -176,8 +176,8 @@ func createTrackManualCmd() *cobra.Command {
 		RunE: func(_ *cobra.Command, _ []string) error {
 			selections := &tracker.Selections{
 				OutputFormat:        outputFormat,
-				BaselineTag:         baselineTag,
-				CurrentTag:          currentTag,
+				Baseline:            Baseline,
+				Current:             Current,
 				ProfileType:         profileType,
 				BenchmarkName:       benchmarkName,
 				RegressionThreshold: regressionThreshold,
@@ -189,8 +189,8 @@ func createTrackManualCmd() *cobra.Command {
 		Example: example,
 	}
 
-	cmd.Flags().StringVar(&baselineTag, baseFlag, "", "Name of the baseline tag")
-	cmd.Flags().StringVar(&currentTag, currentFlag, "", "Name of the current tag")
+	cmd.Flags().StringVar(&Baseline, baseFlag, "", "Name of the baseline tag")
+	cmd.Flags().StringVar(&Current, currentFlag, "", "Name of the current tag")
 	cmd.Flags().StringVar(&outputFormat, outputFormatFlag, "", "Output format choice choice")
 	cmd.Flags().BoolVar(&failOnRegression, failFlag, false, "Exit with non-zero code if regression exceeds threshold")
 	cmd.Flags().Float64Var(&regressionThreshold, thresholdFlag, 0.0, "Fail when worst flat regression exceeds this percent (e.g., 5.0)")
@@ -225,24 +225,24 @@ func getTrackSelections(tags []string) (*tracker.Selections, error) {
 		Options:  tags,
 		PageSize: tuiPageSize,
 	}
-	if err := survey.AskOne(baselinePrompt, &selections.BaselineTag, survey.WithValidator(survey.Required)); err != nil {
+	if err := survey.AskOne(baselinePrompt, &selections.Baseline, survey.WithValidator(survey.Required)); err != nil {
 		return nil, err
 	}
 
 	// Select current tag (filter out baseline)
-	var currentTagOptions []string
+	var currentOptions []string
 	for _, tag := range tags {
-		if tag != selections.BaselineTag {
-			currentTagOptions = append(currentTagOptions, tag)
+		if tag != selections.Baseline {
+			currentOptions = append(currentOptions, tag)
 		}
 	}
 
 	currentPrompt := &survey.Select{
 		Message:  "Select current tag (the 'after' version) [Press Enter to select]:",
-		Options:  currentTagOptions,
+		Options:  currentOptions,
 		PageSize: tuiPageSize,
 	}
-	if err := survey.AskOne(currentPrompt, &selections.CurrentTag, survey.WithValidator(survey.Required)); err != nil {
+	if err := survey.AskOne(currentPrompt, &selections.Current, survey.WithValidator(survey.Required)); err != nil {
 		return nil, err
 	}
 
@@ -271,12 +271,12 @@ func getTrackSelections(tags []string) (*tracker.Selections, error) {
 
 // selectBenchmark discovers and selects a benchmark
 func selectBenchmark(selections *tracker.Selections) error {
-	availableBenchmarks, err := discoverAvailableBenchmarks(selections.BaselineTag)
+	availableBenchmarks, err := discoverAvailableBenchmarks(selections.Baseline)
 	if err != nil {
-		return fmt.Errorf("failed to discover benchmarks for tag %s: %w", selections.BaselineTag, err)
+		return fmt.Errorf("failed to discover benchmarks for tag %s: %w", selections.Baseline, err)
 	}
 	if len(availableBenchmarks) == 0 {
-		return fmt.Errorf("no benchmarks found for tag %s", selections.BaselineTag)
+		return fmt.Errorf("no benchmarks found for tag %s", selections.Baseline)
 	}
 
 	benchPrompt := &survey.Select{
@@ -289,12 +289,12 @@ func selectBenchmark(selections *tracker.Selections) error {
 
 // selectProfileType discovers and selects a profile type
 func selectProfileType(selections *tracker.Selections) error {
-	availableProfiles, err := discoverAvailableProfiles(selections.BaselineTag, selections.BenchmarkName)
+	availableProfiles, err := discoverAvailableProfiles(selections.Baseline, selections.BenchmarkName)
 	if err != nil {
-		return fmt.Errorf("failed to discover profiles for tag %s, benchmark %s: %w", selections.BaselineTag, selections.BenchmarkName, err)
+		return fmt.Errorf("failed to discover profiles for tag %s, benchmark %s: %w", selections.Baseline, selections.BenchmarkName, err)
 	}
 	if len(availableProfiles) == 0 {
-		return fmt.Errorf("no profiles found for tag %s, benchmark %s", selections.BaselineTag, selections.BenchmarkName)
+		return fmt.Errorf("no profiles found for tag %s, benchmark %s", selections.Baseline, selections.BenchmarkName)
 	}
 
 	profilePrompt := &survey.Select{
@@ -348,8 +348,8 @@ func selectRegressionThreshold(selections *tracker.Selections) error {
 
 // setGlobalTrackingVariables sets the global CLI variables for tracking
 func setGlobalTrackingVariables(selections *tracker.Selections) {
-	baselineTag = selections.BaselineTag
-	currentTag = selections.CurrentTag
+	Baseline = selections.Baseline
+	Current = selections.Current
 	benchmarkName = selections.BenchmarkName
 	profileType = selections.ProfileType
 	outputFormat = selections.OutputFormat
@@ -540,7 +540,7 @@ func runTUITrackAuto(_ *cobra.Command, _ []string) error {
 
 	// Now run the actual tracking command
 	fmt.Printf("\n🚀 Running: prof track auto --base %s --current %s --bench-name %s --profile-type %s --output-format %s",
-		selections.BaselineTag, selections.CurrentTag, selections.BenchmarkName, selections.ProfileType, selections.OutputFormat)
+		selections.Baseline, selections.Current, selections.BenchmarkName, selections.ProfileType, selections.OutputFormat)
 	if selections.UseThreshold {
 		fmt.Printf(" --fail-on-regression --regression-threshold %.1f", selections.RegressionThreshold)
 	}

engine/benchmark/helpers.go

@@ -464,7 +464,7 @@ func collectProfileFunctions(args *internal.CollectionArgs) error {
 			return fmt.Errorf("failed to create output directory: %w", err)
 		}
 
-		functions, err := parser.GetAllFunctionNames(paths.ProfileTextFile, args.BenchmarkConfig)
+		functions, err := parser.GetAllFunctionNamesV2(paths.ProfileBinaryFile, args.BenchmarkConfig)
 		if err != nil {
 			return fmt.Errorf("failed to extract function names: %w", err)
 		}

engine/collector/api.go

@@ -54,7 +54,7 @@ func RunCollector(files []string, tag string) error {
 			return err
 		}
 
-		if err = collectFunctions(outputTextFilePath, profileDirPath, fullBinaryPath, functionFilter); err != nil {
+		if err = collectFunctions(profileDirPath, fullBinaryPath, functionFilter); err != nil {
 			return fmt.Errorf("collectFunctions failed: %w", err)
 		}
 	}

engine/collector/helpers.go

@@ -43,9 +43,9 @@ func getFunctionPprofContent(function, binaryFile, outputFile string) error {
 	return nil
 }
 
-func collectFunctions(outputTextFilePath, profileDirPath, fullBinaryPath string, functionFilter internal.FunctionFilter) error {
+func collectFunctions(profileDirPath, fullBinaryPath string, functionFilter internal.FunctionFilter) error {
 	var functions []string
-	functions, err := parser.GetAllFunctionNames(outputTextFilePath, functionFilter)
+	functions, err := parser.GetAllFunctionNamesV2(fullBinaryPath, functionFilter)
 	if err != nil {
 		return fmt.Errorf("failed to extract function names: %w", err)
 	}

engine/tracker/api.go

@@ -9,8 +9,8 @@ import (
 
 // trackAutoSelections holds all the user selections for tracking
 type Selections struct {
-	BaselineTag         string
-	CurrentTag          string
+	Baseline            string
+	Current             string
 	BenchmarkName       string
 	ProfileType         string
 	OutputFormat        string
@@ -88,16 +88,16 @@ func RunTrackManual(selections *Selections) error {
 
 // CheckPerformanceDifferences creates the profile report by comparing data from  prof's auto run.
 func CheckPerformanceDifferences(selections *Selections) (*ProfileChangeReport, error) {
-	textFilePathBaseLine, textFilePathCurrent := chooseFileLocations(selections)
+	binFilePathBaseLine, binFilePathCurrent := chooseFileLocations(selections)
 
-	lineObjsBaseline, err := parser.TurnLinesIntoObjects(textFilePathBaseLine)
+	lineObjsBaseline, err := parser.TurnLinesIntoObjectsV2(binFilePathBaseLine)
 	if err != nil {
-		return nil, fmt.Errorf("couldn't get objs for path: %s, error: %w", textFilePathBaseLine, err)
+		return nil, fmt.Errorf("couldn't get objs for path: %s, error: %w", binFilePathBaseLine, err)
 	}
 
-	lineObjsCurrent, err := parser.TurnLinesIntoObjects(textFilePathCurrent)
+	lineObjsCurrent, err := parser.TurnLinesIntoObjectsV2(binFilePathCurrent)
 	if err != nil {
-		return nil, fmt.Errorf("couldn't get objs for path: %s, error: %w", textFilePathCurrent, err)
+		return nil, fmt.Errorf("couldn't get objs for path: %s, error: %w", binFilePathCurrent, err)
 	}
 
 	matchingMap := createMapFromLineObjects(lineObjsBaseline)

engine/tracker/helpers.go

@@ -147,22 +147,22 @@ func (cr *FunctionChangeResult) writeImpactAssessment(report *strings.Builder) {
 	report.WriteString("\n")
 }
 
-func getTextFilesLocations(selections *Selections) (string, string) {
-	fileName := fmt.Sprintf("%s_%s.txt", selections.BenchmarkName, selections.ProfileType)
-	textFilePath1BaseLine := filepath.Join(internal.MainDirOutput, selections.BaselineTag, internal.ProfileTextDir, selections.BenchmarkName, fileName)
-	textFilePath2Current := filepath.Join(internal.MainDirOutput, selections.CurrentTag, internal.ProfileTextDir, selections.BenchmarkName, fileName)
+func getBinFilesLocations(selections *Selections) (string, string) {
+	fileName := fmt.Sprintf("%s_%s.out", selections.BenchmarkName, selections.ProfileType)
+	binFilePath1BaseLine := filepath.Join(internal.MainDirOutput, selections.Baseline, internal.ProfileBinDir, selections.BenchmarkName, fileName)
+	binFilePath2Current := filepath.Join(internal.MainDirOutput, selections.Current, internal.ProfileBinDir, selections.BenchmarkName, fileName)
 
-	return textFilePath1BaseLine, textFilePath2Current
+	return binFilePath1BaseLine, binFilePath2Current
 }
 
 func chooseFileLocations(selections *Selections) (string, string) {
 	var textFilePathBaseLine, textFilePathCurrent string
 
 	if selections.IsManual {
-		textFilePathBaseLine = selections.BaselineTag
-		textFilePathCurrent = selections.CurrentTag
+		textFilePathBaseLine = selections.Baseline
+		textFilePathCurrent = selections.Current
 	} else {
-		textFilePathBaseLine, textFilePathCurrent = getTextFilesLocations(selections)
+		textFilePathBaseLine, textFilePathCurrent = getBinFilesLocations(selections)
 	}
 
 	return textFilePathBaseLine, textFilePathCurrent