[gcc r12-2710] Fixes for AutoFDO testing

[Eugene Rozenfeld <erozen@gcc.gnu.org>]

https://gcc.gnu.org/g:9265b378531391498ec1727f67a45da72a6c07e9

commit r12-2710-g9265b378531391498ec1727f67a45da72a6c07e9
Author: Eugene Rozenfeld <erozen@microsoft.com>
Date:   Mon Aug 2 18:29:24 2021 -0700

    Fixes for AutoFDO testing
    
    * create_gcov tool doesn't currently support dwarf 5 so I made a change in profopt.exp
      to pass -gdwarf-4 when compiling the binary to profile.
    
    * I updated the invocation of create_gcov in profopt.exp to pass -gcov_version=2.
      I recently made a change to create_gcov to support version 2:
      https://github.com/google/autofdo/pull/117 .
    
    * I removed useless -o perf.data from the invocation of gcc-auto-profile in
      target-supports.exp.
    
    These changes contribute to fixing PR gcov-profile/71672.
    
    gcc/testsuite/ChangeLog:
    
            * lib/profopt.exp: Pass gdwarf-4 when compiling test to profile; pass -gcov_version=2.
            * lib/target-supports.exp: Remove unnecessary -o perf.data passed to gcc-auto-profile.

Diff:
---
 gcc/testsuite/lib/profopt.exp         | 4 ++--
 gcc/testsuite/lib/target-supports.exp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/lib/profopt.exp b/gcc/testsuite/lib/profopt.exp
index 030d25e52e5..25f45ecf2de 100644
--- a/gcc/testsuite/lib/profopt.exp
+++ b/gcc/testsuite/lib/profopt.exp
@@ -289,7 +289,7 @@ proc auto-profopt-execute { src } {
         return
     }
     set profile_wrapper [profopt-perf-wrapper]
-    set profile_option "-g -DFOR_AUTOFDO_TESTING"
+    set profile_option "-gdwarf-4 -DFOR_AUTOFDO_TESTING"
     set feedback_option "-fauto-profile -DFOR_AUTOFDO_TESTING -fearly-inlining"
     set run_autofdo 1
     profopt-execute $src
@@ -451,7 +451,7 @@ proc profopt-execute { src } {
 	    # convert profile
 	    if { $run_autofdo == 1 } {
                 set bprefix "afdo."
-		set cmd "create_gcov --binary $execname1 --profile=$tmpdir/$base.perf.data -gcov_version=1 --gcov=$tmpdir/$bprefix$base.$ext"
+		set cmd "create_gcov --binary $execname1 --profile=$tmpdir/$base.perf.data -gcov_version=2 --gcov=$tmpdir/$bprefix$base.$ext"
 		verbose "Running $cmd"
 		set id [remote_spawn "" $cmd]
 		if { $id < 0 } {
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 42ac9d0ac1a..44465b14b06 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -626,7 +626,7 @@ proc check_effective_target_keeps_null_pointer_checks { } {
 # this allows parallelism of 16 and higher of parallel gcc-auto-profile
 proc profopt-perf-wrapper { } {
     global srcdir
-    return "$srcdir/../config/i386/gcc-auto-profile -o perf.data -m8 "
+    return "$srcdir/../config/i386/gcc-auto-profile -m8 "
 }
 
 # Return true if profiling is supported on the target.