[llvm-exegesis] Analysis tests should run even without libpfm (PR51687)

[RKSimon]

Summary

Move inverse_throughput, latency and uops to sub-directories (like we already do for lbr), which require libpfm so we can relax the lit limits for analysis tests in the x86 root directory.

[lebedev.ri]

Would it be sufficient to create only llvm/test/tools/llvm-exegesis/X86/measuring/ ?

[RKSimon]

In D109353#2986484, @lebedev.ri wrote:

Would it be sufficient to create only llvm/test/tools/llvm-exegesis/X86/measuring/ ?

Whatever people would prefer - I have no preference. What about lbr - would that be moved as well?

[courbet]

In D109353#2986490, @RKSimon wrote:

In D109353#2986484, @lebedev.ri wrote:

Would it be sufficient to create only llvm/test/tools/llvm-exegesis/X86/measuring/ ?

Whatever people would prefer - I have no preference. What about lbr - would that be moved as well?

I vote for separate directories, but no strong preference.

[RKSimon]

I've kept the separate directories for now, if we want to reorganize this in the future it should just be a NFC.

[thakis]

This seems to break tests on arm macs: http://45.33.8.238/macm1/17451/step_11.txt

Please take a look.

[RKSimon]

In D109353#2986659, @thakis wrote:

This seems to break tests on arm macs: http://45.33.8.238/macm1/17451/step_11.txt

Please take a look.

Looking at this now

[RKSimon]

In D109353#2986673, @RKSimon wrote:

In D109353#2986659, @thakis wrote:

This seems to break tests on arm macs: http://45.33.8.238/macm1/17451/step_11.txt

Please take a look.

Looking at this now

Looks to be fixed now: http://45.33.8.238/macm1/17454/step_11.txt

llvm/test/tools/llvm-exegesis/X86/inverse_throughput/lit.local.cfg

else:
     # code snippet and bail out on error.
     llvm_exegesis_exe = lit.util.which('llvm-exegesis', config.llvm_tools_dir)
     if not llvm_exegesis_exe:
         print('llvm-exegesis not found')
         config.unsupported = True
     else:
       try:
           with open(os.devnull, 'w') as quiet:
-              check_llvm_exegesis_uops_result = subprocess.call(
-                [llvm_exegesis_exe, '-mode', 'uops', '-snippets-file', '/dev/null'], stdout=quiet, stderr=quiet)
-              check_llvm_exegesis_latency_result = subprocess.call(
-                [llvm_exegesis_exe, '-mode', 'latency', '-snippets-file', '/dev/null'], stdout=quiet, stderr=quiet)
+              check_llvm_exegesis_inverse_throughput_result = subprocess.call(
+                [llvm_exegesis_exe, '-mode', 'inverse_throughput', '-snippets-file', '/dev/null'], stdout=quiet, stderr=quiet)
       except OSError:
           print('could not exec llvm-exegesis')
           config.unsupported = True
-      if not check_llvm_exegesis_uops_result == 0:
-        config.unsupported = True
-      if not check_llvm_exegesis_latency_result == 0:
+      if not check_llvm_exegesis_inverse_throughput_result == 0:
         config.unsupported = True

llvm/test/tools/llvm-exegesis/X86/latency/lit.local.cfg

else:
     # code snippet and bail out on error.
     llvm_exegesis_exe = lit.util.which('llvm-exegesis', config.llvm_tools_dir)
     if not llvm_exegesis_exe:
         print('llvm-exegesis not found')
         config.unsupported = True
     else:
       try:
           with open(os.devnull, 'w') as quiet:
-              check_llvm_exegesis_uops_result = subprocess.call(
-                [llvm_exegesis_exe, '-mode', 'uops', '-snippets-file', '/dev/null'], stdout=quiet, stderr=quiet)
               check_llvm_exegesis_latency_result = subprocess.call(
                 [llvm_exegesis_exe, '-mode', 'latency', '-snippets-file', '/dev/null'], stdout=quiet, stderr=quiet)
       except OSError:
           print('could not exec llvm-exegesis')
           config.unsupported = True
-      if not check_llvm_exegesis_uops_result == 0:
-        config.unsupported = True
       if not check_llvm_exegesis_latency_result == 0:
         config.unsupported = True

llvm/test/tools/llvm-exegesis/X86/lit.local.cfg

-import subprocess
-import lit.util
-
-if not ('X86' in config.root.targets):
-    # We need support for X86.
-    config.unsupported = True
-
-elif not ('x86_64' in config.root.host_triple):
-    # We need to be running on an X86 host.
-    config.unsupported = True
-
-else:
-    # We need libpfm to be installed and allow reading perf counters. We can
-    # only know that at runtime, so we try to measure the latency of an empty
-    # code snippet and bail out on error.
-    llvm_exegesis_exe = lit.util.which('llvm-exegesis', config.llvm_tools_dir)
-    if not llvm_exegesis_exe:
-        print('llvm-exegesis not found')
-        config.unsupported = True
-    else:
-      try:
-          with open(os.devnull, 'w') as quiet:
-              check_llvm_exegesis_uops_result = subprocess.call(
-                [llvm_exegesis_exe, '-mode', 'uops', '-snippets-file', '/dev/null'], stdout=quiet, stderr=quiet)
-              check_llvm_exegesis_latency_result = subprocess.call(
-                [llvm_exegesis_exe, '-mode', 'latency', '-snippets-file', '/dev/null'], stdout=quiet, stderr=quiet)
-      except OSError:
-          print('could not exec llvm-exegesis')
-          config.unsupported = True
-      if not check_llvm_exegesis_uops_result == 0:
-        config.unsupported = True
-      if not check_llvm_exegesis_latency_result == 0:
-        config.unsupported = True
+if not 'X86' in config.root.targets:

llvm/test/tools/llvm-exegesis/X86/uops/lit.local.cfg

else:
     if not llvm_exegesis_exe:
         print('llvm-exegesis not found')
         config.unsupported = True
     else:
       try:
           with open(os.devnull, 'w') as quiet:
               check_llvm_exegesis_uops_result = subprocess.call(
                 [llvm_exegesis_exe, '-mode', 'uops', '-snippets-file', '/dev/null'], stdout=quiet, stderr=quiet)
-              check_llvm_exegesis_latency_result = subprocess.call(
-                [llvm_exegesis_exe, '-mode', 'latency', '-snippets-file', '/dev/null'], stdout=quiet, stderr=quiet)
       except OSError:
           print('could not exec llvm-exegesis')
           config.unsupported = True
       if not check_llvm_exegesis_uops_result == 0:
-        config.unsupported = True
-      if not check_llvm_exegesis_latency_result == 0:
-        config.unsupported = True
+        config.unsupported = True