scripts: get_feat.pl: improve matrix output

Instead of producing a too wide table, let's split it per
subsystem, and use a better notation in order to make easier
for the reader to identify how a feature is supported on
multiple architectures.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/9c3e8c813e8146c5c30e10fa75974f8fbfe6016a.1606748711.git.mchehab+huawei@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

diff --git a/scripts/get_feat.pl b/scripts/get_feat.pl
index 79d8359..7b92eba 100755 (executable)
--- a/scripts/get_feat.pl
+++ b/scripts/get_feat.pl
@@ -293,68 +293,95 @@ sub output_feature {
 # Output all features for all architectures
 #
 
-sub matrix_lines {
-       print "=" x $max_size_subsys;
-       print "  ";
-       print "=" x $max_size_name;
-       print "  ";
-
-       foreach my $arch (sort keys %archs) {
-               my $len = $max_size_status;
-
-               $len = length($arch) if ($len < length($arch));
+sub matrix_lines($$) {
+       my $partial = shift;
+       my $header = shift;
+       my $split;
+       my $fill;
+       my $ln_marker;
+
+       if ($header) {
+               $ln_marker = "=";
+       } else {
+               $ln_marker = "-";
+       }
 
-               print "=" x $len;
-               print "  ";
+       if ($partial) {
+               $split = "|";
+               $fill = " ";
+       } else {
+               $split = "+";
+               $fill = $ln_marker;
        }
-       print "=" x $max_size_kconfig;
-       print "  ";
-       print "=" x $max_size_description;
-       print "\n";
+
+       print $split;
+       print $fill x $max_size_name;
+       print $split;
+       print $fill x $max_size_kconfig;
+       print $split;
+       print $fill x $max_size_description;
+       print "+";
+       print $ln_marker x $max_size_arch;
+       print "+";
+       print $ln_marker x $max_size_status;
+       print "+\n";
 }
 
 sub output_matrix {
-
-       my $title = "Feature List (feature x architecture)";
+       my $title = "Feature status on all architectures";
 
        print "=" x length($title) . "\n";
        print "$title\n";
        print "=" x length($title) . "\n\n";
 
-       matrix_lines;
-
-       printf "%-${max_size_subsys}s  ", $h_subsys;
-       printf "%-${max_size_name}s  ", $h_name;
+       my $cur_subsys = "";
+       foreach my $name (sort {
+                               ($data{$a}->{subsys} cmp $data{$b}->{subsys}) or
+                               ($a cmp $b)
+                              } keys %data) {
 
-       foreach my $arch (sort keys %archs) {
-               printf "%-${max_size_status}s  ", $arch;
-       }
-       printf "%-${max_size_kconfig}s  ", $h_kconfig;
-       printf "%-${max_size_description}s\n", $h_description;
+               if ($cur_subsys ne $data{$name}->{subsys}) {
+                       if ($cur_subsys ne "") {
+                               printf "\n";
+                       }
 
-       matrix_lines;
+                       $cur_subsys = $data{$name}->{subsys};
 
-       foreach my $name (sort {
-                               ($data{$a}->{subsys} cmp $data{$b}->{subsys}) ||
-                               ($data{$a}->{name} cmp $data{$b}->{name})
-                              } keys %data) {
-               printf "%-${max_size_subsys}s  ", $data{$name}->{subsys};
-               printf "%-${max_size_name}s  ", $name;
+                       my $title = "Subsystem: $cur_subsys";
+                       print "$title\n";
+                       print "=" x length($title) . "\n\n";
 
-               my %arch_table = %{$data{$name}->{table}};
+                       matrix_lines(0, 0);
+                       printf "|%-${max_size_name}s", $h_name;
+                       printf "|%-${max_size_kconfig}s", $h_kconfig;
+                       printf "|%-${max_size_description}s", $h_description;
 
-               foreach my $arch (sort keys %arch_table) {
-                       my $len = $max_size_status;
+                       printf "|%-${max_size_arch}s", $h_arch;
+                       printf "|%-${max_size_status}s|\n", $h_status;
 
-                       $len = length($arch) if ($len < length($arch));
+                       matrix_lines(0, 1);
+               }
 
-                       printf "%-${len}s  ", $arch_table{$arch};
+               my %arch_table = %{$data{$name}->{table}};
+               my $first = 1;
+               foreach my $arch (sort keys %arch_table) {
+                       if ($first) {
+                               printf "|%-${max_size_name}s", $name;
+                               printf "|%-${max_size_kconfig}s", $data{$name}->{kconfig};
+                               printf "|%-${max_size_description}s", $data{$name}->{description};
+                               $first = 0;
+                       } else {
+                               matrix_lines(1, 0);
+
+                               printf "|%-${max_size_name}s", "";
+                               printf "|%-${max_size_kconfig}s", "";
+                               printf "|%-${max_size_description}s", "";
+                       }
+                       printf "|%-${max_size_arch}s", $arch;
+                       printf "|%-${max_size_status}s|\n", $arch_table{$arch};
                }
-               printf "%-${max_size_kconfig}s  ", $data{$name}->{kconfig};
-               printf "%-${max_size_description}s\n", $data{$name}->{description};
+               matrix_lines(0, 0);
        }
-
-       matrix_lines;
 }