Skip to content

Commit e774b3f

Browse files
committed
contrib/intel/jenkins: Add IO_URING test support to tcp fabtests
Signed-off-by: Zach Dworkin <zachary.dworkin@intel.com>
1 parent 0dedad4 commit e774b3f

File tree

6 files changed

+37
-9
lines changed

6 files changed

+37
-9
lines changed

contrib/intel/jenkins/Jenkinsfile

+20
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,9 @@ pipeline {
340340
dir ("${CUSTOM_WORKSPACE}/ucx/libfabric") {
341341
checkout scm
342342
}
343+
dir ("${CUSTOM_WORKSPACE}/iouring/libfabric") {
344+
checkout scm
345+
}
343346
dir (CUSTOM_WORKSPACE) {
344347
checkout_external_resources()
345348
}
@@ -423,6 +426,13 @@ pipeline {
423426
}
424427
}
425428
}
429+
stage ('build-iouring') {
430+
steps {
431+
script {
432+
slurm_build(BUILD_MODES, "ivysaur", "iouring", "ivysaur")
433+
}
434+
}
435+
}
426436
stage ('build-daos') {
427437
agent {
428438
node {
@@ -524,6 +534,16 @@ pipeline {
524534
}
525535
}
526536
}
537+
stage('tcp-iouring') {
538+
steps {
539+
script {
540+
dir (RUN_LOCATION) {
541+
run_fabtests("tcp-iouring", "ivysaur", "ivysaur", "2",
542+
"tcp", null, "FI_TCP_IO_URING=1")
543+
}
544+
}
545+
}
546+
}
527547
stage('verbs-rxm') {
528548
steps {
529549
script {

contrib/intel/jenkins/build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def log_dir(install_path, release=False):
163163
'mpich'])
164164
parser.add_argument('--build_hw', help="HW type for build",
165165
choices=['water', 'grass', 'fire', 'electric', 'ucx',
166-
'daos', 'gpu'])
166+
'daos', 'gpu', 'ivysaur'])
167167
parser.add_argument('--ofi_build_mode', help="select buildmode libfabric "\
168168
"build mode", choices=['reg', 'dbg', 'dl'])
169169
parser.add_argument('--build_loc', help="build location for libfabric "\

contrib/intel/jenkins/common.py

+4
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ def run(self):
139139
'enable' : ['shm'],
140140
'disable' : []
141141
},
142+
'ivysaur': {
143+
'enable' : ['tcp'],
144+
'disable' : []
145+
},
142146
'electric' : {
143147
'enable' : ['shm'],
144148
'disable' : []

contrib/intel/jenkins/runtests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def __call__(self, parser, namespace, values, option_string=None):
1818
parser = argparse.ArgumentParser()
1919
parser.add_argument('--build_hw', help="HW type for build",
2020
choices=['water', 'grass', 'fire', 'electric', 'daos',\
21-
'gpu', 'ucx'])
21+
'gpu', 'ucx', 'ivysaur'])
2222
parser.add_argument('--prov', help="core provider", choices=['verbs', \
2323
'tcp', 'udp', 'sockets', 'shm', 'psm3', 'ucx'])
2424
parser.add_argument('--util', help="utility provider", choices=['rxd', 'rxm'])

contrib/intel/jenkins/summary.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,9 @@ def summarize_items(summary_item, logger, log_dir, mode):
783783
err = 0
784784
mpi_list = ['impi', 'mpich', 'ompi']
785785
logger.log(f"Summarizing {mode} build mode:")
786+
provs = common.prov_list + [('tcp-iouring', None)]
786787
if summary_item == 'fabtests' or summary_item == 'all':
787-
for prov,util in common.prov_list:
788+
for prov,util in provs:
788789
if util:
789790
prov = f'{prov}-{util}'
790791
ret = FabtestsSummarizer(

contrib/intel/jenkins/tests.py

+9-6
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,16 @@ def get_exclude_file(self):
111111
path = self.libfab_installpath
112112
efile_path = f'{path}/share/fabtests/test_configs'
113113

114-
prov = self.util_prov if self.util_prov else self.core_prov
115-
efile_old = f'{efile_path}/{prov}/{prov}.exclude'
116-
117-
if self.util_prov:
118-
efile = f'{efile_path}/{self.util_prov}/{self.core_prov}/exclude'
114+
if self.hw == 'ivysaur':
115+
efile = f'{efile_path}/{self.core_prov}/io_uring.exclude'
119116
else:
120-
efile = f'{efile_path}/{self.core_prov}/exclude'
117+
prov = self.util_prov if self.util_prov else self.core_prov
118+
efile_old = f'{efile_path}/{prov}/{prov}.exclude'
119+
120+
if self.util_prov:
121+
efile = f'{efile_path}/{self.util_prov}/{self.core_prov}/exclude'
122+
else:
123+
efile = f'{efile_path}/{self.core_prov}/exclude'
121124

122125
if os.path.isfile(efile):
123126
return efile

0 commit comments

Comments
 (0)