From 2b47a7e2efc9e94b383914bcd9ed44249427639d Mon Sep 17 00:00:00 2001
From: Charles Volzka <cjvolzka@us.ibm.com>
Date: Fri, 5 Apr 2024 13:35:21 -0500
Subject: [PATCH] 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>
---
 .../NNPA/Runtime/zDNNExtension/Elementwise.c        |  9 ++++++---
 .../NNPA/Runtime/zDNNExtension/MatMul.c             | 13 ++++++++-----
 .../NNPA/Runtime/zDNNExtension/Softmax.c            |  9 ++++++---
 .../NNPA/Runtime/zDNNExtension/zDNNExtension.h      |  6 ++++++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/Accelerators/NNPA/Runtime/zDNNExtension/Elementwise.c b/src/Accelerators/NNPA/Runtime/zDNNExtension/Elementwise.c
index 7d81770c87..e96297a187 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__
-#define _OPEN_THREADS
+  // 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..07fb205fb8 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__
-#define _OPEN_THREADS
-#define _OPEN_SYS_EXT
-#include <sys/ps.h>
+  // 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..471d5fde03 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__
-#define _OPEN_THREADS
+  // 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..f2d6d01f10 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>