Merge "Log bp2build_metrics .pb" am: 8bb0d8f55d am: ceb7c6fa00 am: 93e257f8d0 am: 67e11c948a (175913c9) · Commits · e / os / android_build_soong

bp2build/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ bootstrap_go_package {
		deps: [
		"soong-android",
		"soong-android-soongconfig",
		"soong-shared",
		"soong-apex",
		"soong-bazel",
		"soong-cc",
		@@ -27,6 +28,7 @@ bootstrap_go_package {
		"soong-genrule",
		"soong-python",
		"soong-sh",
		"soong-ui-metrics",
		],
		testSrcs: [
		"android_app_certificate_conversion_test.go",

bp2build/build_conversion.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers

		// Simple metrics tracking for bp2build
		metrics := CodegenMetrics{
		ruleClassCount: make(map[string]int),
		ruleClassCount: make(map[string]uint64),
		}

		dirs := make(map[string]bool)

bp2build/metrics.go

+64 −6

Original line number	Diff line number	Diff line
		@@ -2,34 +2,52 @@ package bp2build

		import (
		"fmt"
		"os"
		"path/filepath"
		"strings"

		"android/soong/android"
		"android/soong/shared"
		"android/soong/ui/metrics/bp2build_metrics_proto"
		)

		// Simple metrics struct to collect information about a Blueprint to BUILD
		// conversion process.
		type CodegenMetrics struct {
		// Total number of Soong modules converted to generated targets
		generatedModuleCount int
		generatedModuleCount uint64

		// Total number of Soong modules converted to handcrafted targets
		handCraftedModuleCount int
		handCraftedModuleCount uint64

		// Total number of unconverted Soong modules
		unconvertedModuleCount int
		unconvertedModuleCount uint64

		// Counts of generated Bazel targets per Bazel rule class
		ruleClassCount map[string]int
		ruleClassCount map[string]uint64

		// List of modules with unconverted deps
		// NOTE: NOT in the .proto
		moduleWithUnconvertedDepsMsgs []string

		// List of converted modules
		convertedModules []string
		}

		// Serialize returns the protoized version of CodegenMetrics: bp2build_metrics_proto.Bp2BuildMetrics
		func (metrics *CodegenMetrics) Serialize() bp2build_metrics_proto.Bp2BuildMetrics {
		return bp2build_metrics_proto.Bp2BuildMetrics{
		GeneratedModuleCount: metrics.generatedModuleCount,
		HandCraftedModuleCount: metrics.handCraftedModuleCount,
		UnconvertedModuleCount: metrics.unconvertedModuleCount,
		RuleClassCount: metrics.ruleClassCount,
		ConvertedModules: metrics.convertedModules,
		}
		}

		// Print the codegen metrics to stdout.
		func (metrics *CodegenMetrics) Print() {
		generatedTargetCount := 0
		generatedTargetCount := uint64(0)
		for _, ruleClass := range android.SortedStringKeys(metrics.ruleClassCount) {
		count := metrics.ruleClassCount[ruleClass]
		fmt.Printf("[bp2build] %s: %d targets\n", ruleClass, count)
		@@ -45,6 +63,40 @@ func (metrics *CodegenMetrics) Print() {
		strings.Join(metrics.moduleWithUnconvertedDepsMsgs, "\n\t"))
		}

		const bp2buildMetricsFilename = "bp2build_metrics.pb"

		// fail prints $PWD to stderr, followed by the given printf string and args (vals),
		// then the given alert, and then exits with 1 for failure
		func fail(err error, alertFmt string, vals ...interface{}) {
		cwd, wderr := os.Getwd()
		if wderr != nil {
		cwd = "FAILED TO GET $PWD: " + wderr.Error()
		}
		fmt.Fprintf(os.Stderr, "\nIn "+cwd+":\n"+alertFmt+"\n"+err.Error()+"\n", vals...)
		os.Exit(1)
		}

		// Write the bp2build-protoized codegen metrics into the given directory
		func (metrics *CodegenMetrics) Write(dir string) {
		if _, err := os.Stat(dir); os.IsNotExist(err) {
		// The metrics dir doesn't already exist, so create it (and parents)
		if err := os.MkdirAll(dir, 0755); err != nil { // rx for all; w for user
		fail(err, "Failed to `mkdir -p` %s", dir)
		}
		} else if err != nil {
		fail(err, "Failed to `stat` %s", dir)
		}
		metricsFile := filepath.Join(dir, bp2buildMetricsFilename)
		if err := metrics.dump(metricsFile); err != nil {
		fail(err, "Error outputting %s", metricsFile)
		}
		if _, err := os.Stat(metricsFile); err != nil {
		fail(err, "MISSING BP2BUILD METRICS OUTPUT: Failed to `stat` %s", metricsFile)
		} else {
		fmt.Printf("\nWrote bp2build metrics to: %s\n", metricsFile)
		}
		}

		func (metrics *CodegenMetrics) IncrementRuleClassCount(ruleClass string) {
		metrics.ruleClassCount[ruleClass] += 1
		}
		@@ -53,12 +105,18 @@ func (metrics *CodegenMetrics) IncrementUnconvertedCount() {
		metrics.unconvertedModuleCount += 1
		}

		func (metrics *CodegenMetrics) TotalModuleCount() int {
		func (metrics *CodegenMetrics) TotalModuleCount() uint64 {
		return metrics.handCraftedModuleCount +
		metrics.generatedModuleCount +
		metrics.unconvertedModuleCount
		}

		// Dump serializes the metrics to the given filename
		func (metrics *CodegenMetrics) dump(filename string) (err error) {
		ser := metrics.Serialize()
		return shared.Save(&ser, filename)
		}

		type ConversionType int

		const (

cmd/soong_build/main.go

+11 −0

Original line number	Diff line number	Diff line
		@@ -537,6 +537,7 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) {
		// for queryview, since that's a total repo-wide conversion and there's a
		// 1:1 mapping for each module.
		metrics.Print()
		writeBp2BuildMetrics(&metrics, configuration)

		ninjaDeps = append(ninjaDeps, codegenContext.AdditionalNinjaDeps()...)
		ninjaDeps = append(ninjaDeps, symlinkForestDeps...)
		@@ -546,3 +547,13 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) {
		// Create an empty bp2build marker file.
		touch(shared.JoinPath(topDir, bp2buildMarker))
		}

		// Write Bp2Build metrics into $LOG_DIR
		func writeBp2BuildMetrics(metrics *bp2build.CodegenMetrics, configuration android.Config) {
		metricsDir := configuration.Getenv("LOG_DIR")
		if len(metricsDir) < 1 {
		fmt.Fprintf(os.Stderr, "\nMissing required env var for generating bp2build metrics: LOG_DIR\n")
		os.Exit(1)
		}
		metrics.Write(metricsDir)
		}

shared/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,11 +9,13 @@ bootstrap_go_package {
		"env.go",
		"paths.go",
		"debug.go",
		"proto.go",
		],
		testSrcs: [
		"paths_test.go",
		],
		deps: [
		"soong-bazel",
		"golang-protobuf-proto",
		],
		}