diff options
| author | Josh Blum | 2012-04-17 11:44:49 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-04-19 18:13:22 -0700 |
| commit | c1348c8cdc8d607a00f2c427e0bdf78c80e836d1 (patch) | |
| tree | 9a84c86d25ddd520459642f784090a1bf340fa30 /volk/gen | |
| parent | f70cb7901a43c201242399225d31eed83e7d41ce (diff) | |
| download | gnuradio-c1348c8cdc8d607a00f2c427e0bdf78c80e836d1.tar.gz gnuradio-c1348c8cdc8d607a00f2c427e0bdf78c80e836d1.tar.bz2 gnuradio-c1348c8cdc8d607a00f2c427e0bdf78c80e836d1.zip | |
volk: remove norc, implement machine overrule
Diffstat (limited to 'volk/gen')
| -rw-r--r-- | volk/gen/machines.xml | 22 | ||||
| -rw-r--r-- | volk/gen/volk_machine_defs.py | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/volk/gen/machines.xml b/volk/gen/machines.xml index 6ce077e3c..8e3c9c8c2 100644 --- a/volk/gen/machines.xml +++ b/volk/gen/machines.xml @@ -1,51 +1,51 @@ <grammar> <machine name="generic"> -<archs>generic</archs> +<archs>generic orc|</archs> </machine> <!-- <machine name="mmx"> -<archs>generic 32|64 mmx</archs> +<archs>generic 32|64 mmx orc|</archs> </machine> <machine name="sse"> -<archs>generic 32|64| mmx sse</archs> +<archs>generic 32|64| mmx sse orc|</archs> </machine> --> <machine name="neon"> -<archs>generic neon</archs> +<archs>generic neon orc|</archs> </machine> <!-- trailing | bar means generate without either for MSVC --> <machine name="sse2"> -<archs>generic 32|64| mmx sse sse2</archs> +<archs>generic 32|64| mmx sse sse2 orc|</archs> </machine> <machine name="sse3"> -<archs>generic 32|64 mmx sse sse2 sse3</archs> +<archs>generic 32|64 mmx sse sse2 sse3 orc|</archs> </machine> <machine name="ssse3"> -<archs>generic 32|64 mmx sse sse2 sse3 ssse3</archs> +<archs>generic 32|64 mmx sse sse2 sse3 ssse3 orc|</archs> </machine> <machine name="sse4_a"> -<archs>generic 32|64 mmx sse sse2 sse3 sse4_a popcount</archs> +<archs>generic 32|64 mmx sse sse2 sse3 sse4_a popcount orc|</archs> </machine> <machine name="sse4_1"> -<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_1</archs> +<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_1 orc|</archs> </machine> <machine name="sse4_2"> -<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount</archs> +<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount orc|</archs> </machine> <!-- trailing | bar means generate without either for MSVC --> <machine name="avx"> -<archs>generic 32|64| mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount avx</archs> +<archs>generic 32|64| mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount avx orc|</archs> </machine> <machine name="altivec"> diff --git a/volk/gen/volk_machine_defs.py b/volk/gen/volk_machine_defs.py index 77ebe64f0..b30a480ba 100644 --- a/volk/gen/volk_machine_defs.py +++ b/volk/gen/volk_machine_defs.py @@ -69,7 +69,7 @@ for machine_xml in machines_xml: val = machine_xml.getElementsByTagName(name)[0].firstChild.data kwargs[name] = val except: pass - kwargs['archs'] = kwargs['archs'].split() + ['orc|norc'] + kwargs['archs'] = kwargs['archs'].split() register_machine(**kwargs) if __name__ == '__main__': |