From 0833dacd244b0abb7bc2205237f07e69055cec06 Mon Sep 17 00:00:00 2001
From: Charles Volzka <42243335+cjvolzka@users.noreply.github.com>
Date: Tue, 9 Apr 2024 07:50:48 -0500
Subject: [PATCH] On z/OS import time.h in addition to sys/time.h (#2788)
 (#2790)

* On z/OS import time.h in addition to sys/time.h

# Description
* On z/OS `CLOCKS_PER_SEC` is in time.h and `timeval` is in sys/time.sh so we need both imported.



---------

Signed-off-by: Charles Volzka <cjvolzka@us.ibm.com>
---
 src/Accelerators/NNPA/Runtime/zDNNExtension/Elementwise.c  | 7 +++++--
 src/Accelerators/NNPA/Runtime/zDNNExtension/MatMul.c       | 7 +++++--
 src/Accelerators/NNPA/Runtime/zDNNExtension/Softmax.c      | 7 +++++--
 .../NNPA/Runtime/zDNNExtension/zDNNExtension.h             | 6 ++++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/Accelerators/NNPA/Runtime/zDNNExtension/Elementwise.c b/src/Accelerators/NNPA/Runtime/zDNNExtension/Elementwise.c
index 7d81770c87..f57343644a 100644
--- a/src/Accelerators/NNPA/Runtime/zDNNExtension/Elementwise.c
+++ b/src/Accelerators/NNPA/Runtime/zDNNExtension/Elementwise.c
@@ -12,14 +12,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Include pthreads (need special treatment on z/OS).
+// z/OS specific includes
 #ifdef __MVS__
+// needed for pthread on z/OS
 #define _OPEN_THREADS
+// z/OS needs <time.h> in addition to <sys/time.h>
+#include <time.h>
 #endif
-#include <pthread.h>
 
 #include <assert.h>
 #include <math.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
diff --git a/src/Accelerators/NNPA/Runtime/zDNNExtension/MatMul.c b/src/Accelerators/NNPA/Runtime/zDNNExtension/MatMul.c
index 22683a2cd2..24e6eb87f9 100644
--- a/src/Accelerators/NNPA/Runtime/zDNNExtension/MatMul.c
+++ b/src/Accelerators/NNPA/Runtime/zDNNExtension/MatMul.c
@@ -12,16 +12,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Include pthreads (need special treatment on z/OS).
+// z/OS specific includes
 #ifdef __MVS__
+// special treatment for pthreads on z/OS.
 #define _OPEN_THREADS
 #define _OPEN_SYS_EXT
 #include <sys/ps.h>
+// z/OS needs <time.h> in addition to <sys/time.h>
+#include <time.h>
 #endif
-#include <pthread.h>
 
 #include <assert.h>
 #include <math.h>
+#include <pthread.h>
 #include <sched.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/Accelerators/NNPA/Runtime/zDNNExtension/Softmax.c b/src/Accelerators/NNPA/Runtime/zDNNExtension/Softmax.c
index 3386dccb1b..2fa7e1beac 100644
--- a/src/Accelerators/NNPA/Runtime/zDNNExtension/Softmax.c
+++ b/src/Accelerators/NNPA/Runtime/zDNNExtension/Softmax.c
@@ -12,14 +12,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Include pthreads (need special treatment on z/OS).
+// z/OS specific includes
 #ifdef __MVS__
+// needed for pthread on z/OS
 #define _OPEN_THREADS
+// z/OS needs <time.h> in addition to <sys/time.h>
+#include <time.h>
 #endif
-#include <pthread.h>
 
 #include <assert.h>
 #include <math.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
diff --git a/src/Accelerators/NNPA/Runtime/zDNNExtension/zDNNExtension.h b/src/Accelerators/NNPA/Runtime/zDNNExtension/zDNNExtension.h
index 11304c3f6b..94b837fa55 100644
--- a/src/Accelerators/NNPA/Runtime/zDNNExtension/zDNNExtension.h
+++ b/src/Accelerators/NNPA/Runtime/zDNNExtension/zDNNExtension.h
@@ -15,6 +15,12 @@
 #ifndef ONNX_MLIR_ZDNNEXTENSION_H
 #define ONNX_MLIR_ZDNNEXTENSION_H
 
+// z/OS specific includes
+#ifdef __MVS__
+// z/OS needs <time.h> in addition to <sys/time.h>
+#include <time.h>
+#endif
+
 #include <stdlib.h>
 #include <sys/time.h>