Non-SFI mode: Enable PnaclTransitional Non-SFI browser tests on x86-64 bots.

ppapi/ppapi_nacl.gyp

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This GYP file defines untrusted (NaCl) targets.  All targets in this
 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid
 # requiring NaCl sources for building.
 
 {
   'includes': [
@@ skipping 217 matching lines @@
                 }],
                 ['target_arch=="x64" or (target_arch=="ia32" and OS=="win")', {
                   'inputs': [
                     '>(out_pnacl_newlib_x86_64_nexe)',
                   ],
                 }],
               ],
             },
           ],
         }],
-        ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="arm") and OS=="linux"', {
+        ['disable_pnacl==0 and (target_arch=="ia32" or target_arch=="x64" or target_arch=="arm") and OS=="linux"', {
           # In addition to above configuration, build x86-32 and arm nonsfi
           # .nexe files by translating from .pexe binary, for non-SFI mode PPAPI
           # testing.
           'variables': {
             'translate_pexe_with_build': 1,
             'nmf_nonsfi%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_nonsfi.nmf',
           },
           'conditions': [
-            ['target_arch=="ia32"', {
+            ['target_arch=="ia32" or target_arch=="x64"', {
               'variables': {
                 'enable_x86_32_nonsfi': 1,
               },
             }],
             ['target_arch=="arm"', {
               'variables': {
                 'enable_arm_nonsfi': 1,
               },
             }],
           ],
           # Shim is a dependency for the nexe because we pre-translate.
          'dependencies': [
             '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
           ],
           'actions': [
             {
               'action_name': 'Generate PNACL NEWLIB NONSFI NMF',
               'inputs': ['>(create_nonsfi_test_nmf)'],
               'outputs': ['>(nmf_nonsfi)'],
               'action': [
                 'python',
                 '>(create_nonsfi_test_nmf)',
                 '--output=>(nmf_nonsfi)',
               ],
               'target_conditions': [
-                ['enable_x86_32_nonsfi==1', {
+                ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="ia32"', {

[Mark Seaborn, 2015/01/17 00:50:47]

Can this be
  target_arch=="ia32"
rather than
  "<(target_arch)"=="ia32"
?

Or is there some Gyp oddity here?

[hidehiko, 2015/01/28 15:04:16]

target_arch is not defined at the moment. Pls see other similar examples in
Chrome's gyp.

+                  'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
                   'action': [
                     '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
                     '--arch=x86-32',
-                  ],
+                  ]
+                }],
+                ['enable_x86_32_nonsfi==1 and "<(target_arch)"=="x64"', {
+                  'inputs': ['>(out_pnacl_newlib_x86_32_nonsfi_nexe)'],
+                  'action': [
+                    '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)',
+                    '--arch=x86-64',

[Mark Seaborn, 2015/01/17 00:50:47]

Shouldn't this be x86-32?

We shouldn't need to have an "x86-64(-nonsfi)" entry in the NMF that points to
"x86-32-nonsfi" binaries. :-)

I guess the right thing to do here is to tweak src/trusted/plugin/ to use
"x86-32-nonsfi" in x86-64 builds?  Or is that fiddly enough that we should leave
it to a later cleanup?

[hidehiko, 2015/01/28 15:04:16]

I thought, the arch in the program section of nmf is the chrome's (i.e. target)
arch, isn't it? Running x86-32-nonsfi on 64bit chrome sounds like an surprising
behavior, as we allows x86-64?

[Mark Seaborn, 2015/01/28 21:51:04]

The arch key of an NMF entry is supposed to correspond to the architecture of
the files that the NMF entry points to.

The developer shouldn't need to care about whether Chrome's renderer & browser
processes run as x86-32 or x86-64.  What matters is whether the nexe that Chrome
chooses is x86-32 or x86-64.
Why is that surprising?  Running x86-32-nonsfi on 64-bit Chrome is the plan.  As
your design doc says, we want to "support x86-32 BMM even when the rest of
Chromium is built as x86-64"
(https://docs.google.com/a/chromium.org/document/d/1Dn7lBloLlKq8JEIZYg7xzZhrXt...).

The only tricky thing here is that, in x86-64 Chromium builds, there is a
difference between:

 1) nacl_helper (old): uses "x86-64 non-sfi mode" (which the PNaCl toolchain
can't target)
 2) nacl_helper_nonsfi (new): uses "x86-32 non-sfi mode"

[hidehiko, 2015/01/29 14:43:12]

I see.

I look into it, but fallback logic applying only for nacl_helper_nonsfi x86-64
looks to need a bit complicated code.
So, how about keep the current "hack" for now? Considering;
1) Anyway, we need to clean up browser_tests on x64 Chrome (e.g. libcfree)
2) Implementing fallback logic unconditionally looks much simpler than applying
only nacl_helper_nonsfi.
3) We are sure that nonsfi on x64 is anyway testing only.

WDYT? Added TODO, instead.

+                  ]
                 }],
                 ['enable_arm_nonsfi==1', {
+                  'inputs': ['>(out_pnacl_newlib_arm_nonsfi_nexe)'],
                   'action': [
                     '--program=>(out_pnacl_newlib_arm_nonsfi_nexe)',
                     '--arch=arm',
-                  ],
+                  ]
                 }],
               ],
             },
           ],
         }],
         ['disable_pnacl==0 and target_arch=="arm"', {
           'variables': {
             'build_pnacl_newlib': 1,
             'translate_pexe_with_build': 1,
             'nmf_pnacl%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl.nmf',
@@ skipping 37 matching lines @@
                 '>@(_inputs)',
                 '--output=>(nmf_pnacl)',
               ],
             },
           ],
         }],
       ],
     },
   ],
 }