Skip to content

Commit daf8bdc

Browse files
huonwhuonw
committed
Fix typos in some x86 and arm intrinsics.
1 parent 3e9b726 commit daf8bdc

File tree

6 files changed

+71
-47
lines changed

6 files changed

+71
-47
lines changed

‎src/etc/platform-intrinsics/arm.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -337,56 +337,56 @@
337337
"args": ["0", "0"]
338338
},
339339
{
340-
"intrinsic": "qtbl1_{0.data_type}",
340+
"intrinsic": "tbl1_{0.data_type}",
341341
"width": [64],
342342
"llvm": "tbl1",
343343
"ret": "i8",
344-
"args": ["0x128", "0u"]
344+
"args": ["0", "0u"]
345345
},
346346
{
347-
"intrinsic": "qtbx1_{0.data_type}",
347+
"intrinsic": "tbx1_{0.data_type}",
348348
"width": [64],
349349
"llvm": "tbx1",
350350
"ret": "i8",
351351
"args": ["0", "0", "0u"]
352352
},
353353
{
354-
"intrinsic": "qtbl2_{0.data_type}",
354+
"intrinsic": "tbl2_{0.data_type}",
355355
"width": [64],
356356
"llvm": "tbl2",
357357
"ret": "i8",
358358
"args": ["(0,0)f", "0u"]
359359
},
360360
{
361-
"intrinsic": "qtbx2_{0.data_type}",
361+
"intrinsic": "tbx2_{0.data_type}",
362362
"width": [64],
363363
"llvm": "tbx2",
364364
"ret": "i8",
365365
"args": ["(0,0)f", "0u"]
366366
},
367367
{
368-
"intrinsic": "qtbl3_{0.data_type}",
368+
"intrinsic": "tbl3_{0.data_type}",
369369
"width": [64],
370370
"llvm": "tbl3",
371371
"ret": "i8",
372372
"args": ["(0,0,0)f", "0u"]
373373
},
374374
{
375-
"intrinsic": "qtbx3_{0.data_type}",
375+
"intrinsic": "tbx3_{0.data_type}",
376376
"width": [64],
377377
"llvm": "tbx3",
378378
"ret": "i8",
379379
"args": ["0", "(0,0,0)f", "0u"]
380380
},
381381
{
382-
"intrinsic": "qtbl4_{0.data_type}",
382+
"intrinsic": "tbl4_{0.data_type}",
383383
"width": [64],
384384
"llvm": "tbl4",
385385
"ret": "i8",
386386
"args": ["(0,0,0,0)f", "0u"]
387387
},
388388
{
389-
"intrinsic": "qtbx4_{0.data_type}",
389+
"intrinsic": "tbx4_{0.data_type}",
390390
"width": [64],
391391
"llvm": "tbx4",
392392
"ret": "i8",

‎src/etc/platform-intrinsics/x86/sse.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@
3535
"llvm": "rcp.ps",
3636
"ret": "f32",
3737
"args": ["0"]
38+
},
39+
{
40+
"intrinsic": "_sqrt_ps",
41+
"width": [128],
42+
"llvm": "!llvm.sqrt.v4f32",
43+
"ret": "f32",
44+
"args": ["0"]
3845
}
3946
]
4047
}

‎src/etc/platform-intrinsics/x86/sse2.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,13 @@
9999
"ret": "u64",
100100
"args": ["u8", "u8"]
101101
},
102+
{
103+
"intrinsic": "_sqrt_pd",
104+
"width": [128],
105+
"llvm": "!llvm.sqrt.v2f64",
106+
"ret": "f64",
107+
"args": ["0"]
108+
},
102109
{
103110
"intrinsic": "_subs_{0.data_type}",
104111
"width": [128],

‎src/etc/platform-intrinsics/x86/sse42.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{
2626
"intrinsic": "_cmpestrm",
2727
"width": [128],
28-
"llvm": "pcmpestrim128",
28+
"llvm": "pcmpestrm128",
2929
"ret": "s8",
3030
"args": ["s8", "S32", "s8", "S32", "S32"]
3131
},
@@ -55,49 +55,49 @@
5555
"width": [128],
5656
"llvm": "pcmpistria128",
5757
"ret": "S32",
58-
"args": ["s8", "S32", "s8", "S32", "S32"]
58+
"args": ["s8", "s8", "S32"]
5959
},
6060
{
6161
"intrinsic": "_cmpistrc",
6262
"width": [128],
6363
"llvm": "pcmpistric128",
6464
"ret": "S32",
65-
"args": ["s8", "S32", "s8", "S32", "S32"]
65+
"args": ["s8", "s8", "S32"]
6666
},
6767
{
6868
"intrinsic": "_cmpistri",
6969
"width": [128],
70-
"llvm": "pcmpistrii128",
70+
"llvm": "pcmpistri128",
7171
"ret": "S32",
72-
"args": ["s8", "S32", "s8", "S32", "S32"]
72+
"args": ["s8", "s8", "S32"]
7373
},
7474
{
7575
"intrinsic": "_cmpistrm",
7676
"width": [128],
77-
"llvm": "pcmpistrim128",
77+
"llvm": "pcmpistrm128",
7878
"ret": "s8",
79-
"args": ["s8", "S32", "s8", "S32", "S32"]
79+
"args": ["s8", "s8", "S32"]
8080
},
8181
{
8282
"intrinsic": "_cmpistro",
8383
"width": [128],
8484
"llvm": "pcmpistrio128",
8585
"ret": "S32",
86-
"args": ["s8", "S32", "s8", "S32", "S32"]
86+
"args": ["s8", "s8", "S32"]
8787
},
8888
{
8989
"intrinsic": "_cmpistrs",
9090
"width": [128],
9191
"llvm": "pcmpistris128",
9292
"ret": "S32",
93-
"args": ["s8", "S32", "s8", "S32", "S32"]
93+
"args": ["s8", "s8", "S32"]
9494
},
9595
{
9696
"intrinsic": "_cmpistrz",
9797
"width": [128],
9898
"llvm": "pcmpistriz128",
9999
"ret": "S32",
100-
"args": ["s8", "S32", "s8", "S32", "S32"]
100+
"args": ["s8", "s8", "S32"]
101101
}
102102
]
103103
}

‎src/librustc_platform_intrinsics/arm.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,82 +2000,82 @@ pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> {
20002000
output: v(f(32), 4),
20012001
definition: Named("llvm.neon.vpminf.v4f32")
20022002
},
2003-
"qtbl1_s8" => Intrinsic {
2004-
inputs: vec![v(i(8), 16), v(u(8), 8)],
2003+
"tbl1_s8" => Intrinsic {
2004+
inputs: vec![v(i(8), 8), v(u(8), 8)],
20052005
output: v(i(8), 8),
20062006
definition: Named("llvm.neon.vtbl1")
20072007
},
2008-
"qtbl1_u8" => Intrinsic {
2009-
inputs: vec![v(u(8), 16), v(u(8), 8)],
2008+
"tbl1_u8" => Intrinsic {
2009+
inputs: vec![v(u(8), 8), v(u(8), 8)],
20102010
output: v(u(8), 8),
20112011
definition: Named("llvm.neon.vtbl1")
20122012
},
2013-
"qtbx1_s8" => Intrinsic {
2013+
"tbx1_s8" => Intrinsic {
20142014
inputs: vec![v(i(8), 8), v(i(8), 8), v(u(8), 8)],
20152015
output: v(i(8), 8),
20162016
definition: Named("llvm.neon.vtbx1")
20172017
},
2018-
"qtbx1_u8" => Intrinsic {
2018+
"tbx1_u8" => Intrinsic {
20192019
inputs: vec![v(u(8), 8), v(u(8), 8), v(u(8), 8)],
20202020
output: v(u(8), 8),
20212021
definition: Named("llvm.neon.vtbx1")
20222022
},
2023-
"qtbl2_s8" => Intrinsic {
2023+
"tbl2_s8" => Intrinsic {
20242024
inputs: vec![agg(true, vec![v(i(8), 8), v(i(8), 8)]), v(u(8), 8)],
20252025
output: v(i(8), 8),
20262026
definition: Named("llvm.neon.vtbl2")
20272027
},
2028-
"qtbl2_u8" => Intrinsic {
2028+
"tbl2_u8" => Intrinsic {
20292029
inputs: vec![agg(true, vec![v(u(8), 8), v(u(8), 8)]), v(u(8), 8)],
20302030
output: v(u(8), 8),
20312031
definition: Named("llvm.neon.vtbl2")
20322032
},
2033-
"qtbx2_s8" => Intrinsic {
2033+
"tbx2_s8" => Intrinsic {
20342034
inputs: vec![agg(true, vec![v(i(8), 8), v(i(8), 8)]), v(u(8), 8)],
20352035
output: v(i(8), 8),
20362036
definition: Named("llvm.neon.vtbx2")
20372037
},
2038-
"qtbx2_u8" => Intrinsic {
2038+
"tbx2_u8" => Intrinsic {
20392039
inputs: vec![agg(true, vec![v(u(8), 8), v(u(8), 8)]), v(u(8), 8)],
20402040
output: v(u(8), 8),
20412041
definition: Named("llvm.neon.vtbx2")
20422042
},
2043-
"qtbl3_s8" => Intrinsic {
2043+
"tbl3_s8" => Intrinsic {
20442044
inputs: vec![agg(true, vec![v(i(8), 8), v(i(8), 8), v(i(8), 8)]), v(u(8), 8)],
20452045
output: v(i(8), 8),
20462046
definition: Named("llvm.neon.vtbl3")
20472047
},
2048-
"qtbl3_u8" => Intrinsic {
2048+
"tbl3_u8" => Intrinsic {
20492049
inputs: vec![agg(true, vec![v(u(8), 8), v(u(8), 8), v(u(8), 8)]), v(u(8), 8)],
20502050
output: v(u(8), 8),
20512051
definition: Named("llvm.neon.vtbl3")
20522052
},
2053-
"qtbx3_s8" => Intrinsic {
2053+
"tbx3_s8" => Intrinsic {
20542054
inputs: vec![v(i(8), 8), agg(true, vec![v(i(8), 8), v(i(8), 8), v(i(8), 8)]), v(u(8), 8)],
20552055
output: v(i(8), 8),
20562056
definition: Named("llvm.neon.vtbx3")
20572057
},
2058-
"qtbx3_u8" => Intrinsic {
2058+
"tbx3_u8" => Intrinsic {
20592059
inputs: vec![v(u(8), 8), agg(true, vec![v(u(8), 8), v(u(8), 8), v(u(8), 8)]), v(u(8), 8)],
20602060
output: v(u(8), 8),
20612061
definition: Named("llvm.neon.vtbx3")
20622062
},
2063-
"qtbl4_s8" => Intrinsic {
2063+
"tbl4_s8" => Intrinsic {
20642064
inputs: vec![agg(true, vec![v(i(8), 8), v(i(8), 8), v(i(8), 8), v(i(8), 8)]), v(u(8), 8)],
20652065
output: v(i(8), 8),
20662066
definition: Named("llvm.neon.vtbl4")
20672067
},
2068-
"qtbl4_u8" => Intrinsic {
2068+
"tbl4_u8" => Intrinsic {
20692069
inputs: vec![agg(true, vec![v(u(8), 8), v(u(8), 8), v(u(8), 8), v(u(8), 8)]), v(u(8), 8)],
20702070
output: v(u(8), 8),
20712071
definition: Named("llvm.neon.vtbl4")
20722072
},
2073-
"qtbx4_s8" => Intrinsic {
2073+
"tbx4_s8" => Intrinsic {
20742074
inputs: vec![v(i(8), 8), agg(true, vec![v(i(8), 8), v(i(8), 8), v(i(8), 8), v(i(8), 8)]), v(u(8), 8)],
20752075
output: v(i(8), 8),
20762076
definition: Named("llvm.neon.vtbx4")
20772077
},
2078-
"qtbx4_u8" => Intrinsic {
2078+
"tbx4_u8" => Intrinsic {
20792079
inputs: vec![v(u(8), 8), agg(true, vec![v(u(8), 8), v(u(8), 8), v(u(8), 8), v(u(8), 8)]), v(u(8), 8)],
20802080
output: v(u(8), 8),
20812081
definition: Named("llvm.neon.vtbx4")

‎src/librustc_platform_intrinsics/x86.rs

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> {
4545
output: v(f(32), 4),
4646
definition: Named("llvm.x86.sse.rcp.ps")
4747
},
48+
"_sqrt_ps" => Intrinsic {
49+
inputs: vec![v(f(32), 4)],
50+
output: v(f(32), 4),
51+
definition: Named("llvm.sqrt.v4f32")
52+
},
4853
"_adds_epi8" => Intrinsic {
4954
inputs: vec![v(i(8), 16), v(i(8), 16)],
5055
output: v(i(8), 16),
@@ -155,6 +160,11 @@ pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> {
155160
output: v(u(64), 2),
156161
definition: Named("llvm.x86.sse2.psad.bw")
157162
},
163+
"_sqrt_pd" => Intrinsic {
164+
inputs: vec![v(f(64), 2)],
165+
output: v(f(64), 2),
166+
definition: Named("llvm.sqrt.v2f64")
167+
},
158168
"_subs_epi8" => Intrinsic {
159169
inputs: vec![v(i(8), 16), v(i(8), 16)],
160170
output: v(i(8), 16),
@@ -378,7 +388,7 @@ pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> {
378388
"_cmpestrm" => Intrinsic {
379389
inputs: vec![v(i(8), 16), i(32), v(i(8), 16), i(32), i(32)],
380390
output: v(i(8), 16),
381-
definition: Named("llvm.x86.sse42.pcmpestrim128")
391+
definition: Named("llvm.x86.sse42.pcmpestrm128")
382392
},
383393
"_cmpestro" => Intrinsic {
384394
inputs: vec![v(i(8), 16), i(32), v(i(8), 16), i(32), i(32)],
@@ -396,37 +406,37 @@ pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> {
396406
definition: Named("llvm.x86.sse42.pcmpestriz128")
397407
},
398408
"_cmpistra" => Intrinsic {
399-
inputs: vec![v(i(8), 16), i(32), v(i(8), 16), i(32), i(32)],
409+
inputs: vec![v(i(8), 16), v(i(8), 16), i(32)],
400410
output: i(32),
401411
definition: Named("llvm.x86.sse42.pcmpistria128")
402412
},
403413
"_cmpistrc" => Intrinsic {
404-
inputs: vec![v(i(8), 16), i(32), v(i(8), 16), i(32), i(32)],
414+
inputs: vec![v(i(8), 16), v(i(8), 16), i(32)],
405415
output: i(32),
406416
definition: Named("llvm.x86.sse42.pcmpistric128")
407417
},
408418
"_cmpistri" => Intrinsic {
409-
inputs: vec![v(i(8), 16), i(32), v(i(8), 16), i(32), i(32)],
419+
inputs: vec![v(i(8), 16), v(i(8), 16), i(32)],
410420
output: i(32),
411-
definition: Named("llvm.x86.sse42.pcmpistrii128")
421+
definition: Named("llvm.x86.sse42.pcmpistri128")
412422
},
413423
"_cmpistrm" => Intrinsic {
414-
inputs: vec![v(i(8), 16), i(32), v(i(8), 16), i(32), i(32)],
424+
inputs: vec![v(i(8), 16), v(i(8), 16), i(32)],
415425
output: v(i(8), 16),
416-
definition: Named("llvm.x86.sse42.pcmpistrim128")
426+
definition: Named("llvm.x86.sse42.pcmpistrm128")
417427
},
418428
"_cmpistro" => Intrinsic {
419-
inputs: vec![v(i(8), 16), i(32), v(i(8), 16), i(32), i(32)],
429+
inputs: vec![v(i(8), 16), v(i(8), 16), i(32)],
420430
output: i(32),
421431
definition: Named("llvm.x86.sse42.pcmpistrio128")
422432
},
423433
"_cmpistrs" => Intrinsic {
424-
inputs: vec![v(i(8), 16), i(32), v(i(8), 16), i(32), i(32)],
434+
inputs: vec![v(i(8), 16), v(i(8), 16), i(32)],
425435
output: i(32),
426436
definition: Named("llvm.x86.sse42.pcmpistris128")
427437
},
428438
"_cmpistrz" => Intrinsic {
429-
inputs: vec![v(i(8), 16), i(32), v(i(8), 16), i(32), i(32)],
439+
inputs: vec![v(i(8), 16), v(i(8), 16), i(32)],
430440
output: i(32),
431441
definition: Named("llvm.x86.sse42.pcmpistriz128")
432442
},

0 commit comments

Comments
 (0)