[test-suite] Add support for Hexagon

[bcain]

Summary

• add hexagon to DetectArchitecture
• disable MiBench, DOE-ProxyApps-C* tests currently unable to support

[bcain]

Accidentally omitted context lines w/previous patch

[bcain]

This is my first change to the test-suite, let me know if I'm doing this right. :)

[lebedev.ri]

MicroBenchmarks/libs/benchmark-1.3.0/src/cycleclock.h

85

Can you please submit this as a pull request upstream?

[bcain]

MicroBenchmarks/libs/benchmark-1.3.0/src/cycleclock.h

85

Oh, you bet! I didn't know we could use PRs.

There's been a few threads and I've only skimmed them. Now that you mention it I might've seen one that mentioned test-suite and PRs.

[lebedev.ri]

MicroBenchmarks/libs/benchmark-1.3.0/src/cycleclock.h

85

I'm not sure what you mean.
I was only talking about MicroBenchmarks/libs/benchmark-1.3.0/* change,
about upstreaming it to https://github.com/google/benchmark

[bcain]

MicroBenchmarks/libs/benchmark-1.3.0/src/cycleclock.h

85

Oh, whoops! Jumped the gun there.

Ok, will do. Once it lands there, do I make another review here to pull down the next release of that benchmark? Or does that happen naturally somehow?

[bcain]

Omitted out-of-scope change to benchmark's cycleclock.h

[lebedev.ri]

MicroBenchmarks/libs/benchmark-1.3.0/src/cycleclock.h

85

Ok, will do. Once it lands there, do I make another review here to pull down the next release of that benchmark?

No, just cherry-pick that commit (note that there are at least 3 copies of benchmark within LLVM monorepo,
so you might want to patch them all at the same time..),
and add a comment about the cherry-pick into benchmark/README.llvm.

[bcain]

Any general review disposition for the latest patch w/only changes to MultiSource/Benchmarks/CMakeLists.txt and cmake/modules/DetectArchitecture.c?

MicroBenchmarks/libs/benchmark-1.3.0/src/cycleclock.h

85

No, just cherry-pick that commit (note that there are at least 3 copies of benchmark within LLVM monorepo,

Ok, will do. I expect that it may be a while before I can contribute there but I'll get the process started.

[lebedev.ri]

MicroBenchmarks/libs/benchmark-1.3.0/src/cycleclock.h

85

Thanks!

[bcain]

In D76958#1957120, @bcain wrote:

Any general review disposition for the latest patch w/only changes to MultiSource/Benchmarks/CMakeLists.txt and cmake/modules/DetectArchitecture.c?

Any thoughts on the remainder of the current state of the patch? Anything that should prevent me from merging this as-is?

@lebedev.ri @luismarques

[bcain]

In D76958#1958634, @bcain wrote:

In D76958#1957120, @bcain wrote:

Any general review disposition for the latest patch w/only changes to MultiSource/Benchmarks/CMakeLists.txt and cmake/modules/DetectArchitecture.c?

Any thoughts on the remainder of the current state of the patch? Anything that should prevent me from merging this as-is?

@lebedev.ri @luismarques

Ping.

Any objections?

[sidneym]

Missing context but otherwise looks ok to me.

MicroBenchmarks/libs/benchmark-1.3.0/src/cycleclock.h

 #elif defined(__i386__)
   int64_t ret;
   __asm__ volatile("rdtsc" : "=A"(ret));
   return ret;
 #elif defined(__x86_64__) || defined(__amd64__)
   uint64_t low, high;
   __asm__ volatile("rdtsc" : "=a"(low), "=d"(high));
   return (high << 32) | low;
+#elif defined(__hexagon__)
+  uint64_t  retv;
+
+  asm volatile ("r0=#0x52; trap0(#0); %0=r1:0;"
+         :"=r"(retv)        /* output */
+         :                  /* no inputs */
+         :"r0", "r1"      /* clobbered register */
+         );
+  return(retv);
 #elif defined(__powerpc__) || defined(__ppc__)
   // This returns a time-base, which is not always precisely a cycle-count.
   int64_t tbl, tbu0, tbu1;
   asm("mftbu %0" : "=r"(tbu0));
   asm("mftb  %0" : "=r"(tbl));
   asm("mftbu %0" : "=r"(tbu1));
   tbl &= -static_cast<int64_t>(tbu0 == tbu1);
   // high 32 bits in tbu1; low 32 bits in tbl  (tbu0 is garbage)

MultiSource/Benchmarks/CMakeLists.txt

 add_subdirectory(ASCI_Purple)
 add_subdirectory(ASC_Sequoia)
 add_subdirectory(BitBench)
 add_subdirectory(Fhourstones)
 add_subdirectory(Fhourstones-3.1)
 add_subdirectory(FreeBench)
 add_subdirectory(MallocBench)
 add_subdirectory(McCat)
-add_subdirectory(MiBench)
 add_subdirectory(NPB-serial)
 add_subdirectory(Olden)
 add_subdirectory(Prolangs-C)
 add_subdirectory(Ptrdist)
 add_subdirectory(SciMark2-C)
 add_subdirectory(Trimaran)
 add_subdirectory(VersaBench)
 add_subdirectory(llubenchmark)
 add_subdirectory(mediabench)
 add_subdirectory(nbench)
 add_subdirectory(sim)
-add_subdirectory(DOE-ProxyApps-C)
 add_subdirectory(Rodinia)
 
 if((NOT "${TARGET_OS}" STREQUAL "Darwin") OR (NOT "${ARCH}" STREQUAL "ARM"))
   add_subdirectory(TSVC)
 endif()
 add_subdirectory(Prolangs-C++)
 add_subdirectory(Bullet)
 add_subdirectory(tramp3d-v4)
+if(NOT "${ARCH}" STREQUAL "Hexagon")
   add_subdirectory(DOE-ProxyApps-C++)
+  add_subdirectory(DOE-ProxyApps-C)
+  add_subdirectory(MiBench)
+endif()
 if(NOT "${ARCH}" STREQUAL "XCore")
   add_subdirectory(7zip)
   add_subdirectory(PAQ8p)
 endif()
 if(NOT DEFINED SMALL_PROBLEM_SIZE)
   add_subdirectory(mafft)
 endif()

cmake/modules/DetectArchitecture.c

 #elif defined(__s390__)
 const char *str = "ARCHITECTURE IS SystemZ";
 #elif defined(__sparc__)
 const char *str = "ARCHITECTURE IS Sparc";
 #elif defined(__xcore__)
 const char *str = "ARCHITECTURE IS XCore";
 #elif defined(__i386__) || defined(__x86_64__)
 const char *str = "ARCHITECTURE IS x86";
+#elif defined(__hexagon__)
+const char *str = "ARCHITECTURE IS Hexagon";
 #endif
 
 int main(int argc, char **argv) {
     int require = str[argc];
     (void)argv;
     return require;
 }