Skip to content

Remove TFSendRecvOpaqueHandle flag #21733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 9, 2019
Merged

Remove TFSendRecvOpaqueHandle flag #21733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e38077a
Remove TFSendRecvOpaquehandle flag.
bgogul Jan 9, 2019
1a8c796
Remove run-simple-swift-send-recv-handle from lit.cfg
bgogul Jan 9, 2019
e80a956
Remove declaration of diagnoseOpaqueHandleCopy
bgogul Jan 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 1 addition & 69 deletions lib/SILOptimizer/Mandatory/TFPartition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ static llvm::cl::opt<bool> TFWarnScalarTransfer(
"Emit warnings for sends/receives that transfer values that are "
"known to be scalar."));

// TODO: Remove this short-term flag once we migrate over all unit tests.
static llvm::cl::opt<bool> TFSendRecvOpaqueHandle(
"tf-send-recv-opaque-handle", llvm::cl::init(true),
llvm::cl::desc("When true, variant and resource handles can be sent via "
"eager API as tensor handles."));

template <typename... T, typename... U>
static InFlightDiagnostic diagnose(ASTContext &Context, SourceLoc loc,
Diag<T...> diag, U &&... args) {
Expand Down Expand Up @@ -789,7 +783,6 @@ class TFFunctionPartition {
void diagnoseUsesFromHost(SILValue value, SILLocation loc);
void diagnoseCopyToHost(SILValue value, SILInstruction *user,
SILLocation loc);
void diagnoseOpaqueHandleCopy(SILValue value, SILInstruction *user);

private:
// Marking.
Expand Down Expand Up @@ -932,13 +925,6 @@ void TFFunctionPartition::diagnoseCopyToAccelerator(
// Try to determine a good source location to report.
auto loc = getUserSourceLocation(value);

// Opaque handles can never be sent or passed as tensor program arguments.
// Type checking must have rejected host functions that are either a)
// public with private ABI or b) marked @inline(never).
assert(TFSendRecvOpaqueHandle ||
(!isOpaqueHandle(value->getType()) &&
"Opaque handles should never have been on the host"));

// Try to make a useful description of the value being copied to help
// disambiguate.
std::string description = "value";
Expand Down Expand Up @@ -1040,12 +1026,6 @@ void TFFunctionPartition::diagnoseUsesFromHost(SILValue value,
if (isUserIgnoredByPartitioning(user))
continue;

// If the value is a non-copyable opaque handle, emit an error.
if (!TFSendRecvOpaqueHandle && isOpaqueHandle(value->getType())) {
diagnoseOpaqueHandleCopy(value, user);
continue;
}

// If we are running this in the context of an expression run in the REPL or
// playgrounds, or script mode, then we should never emit a warning: we know
// we're going to be implicitly copying things in as warnings all the time.
Expand Down Expand Up @@ -1105,20 +1085,6 @@ void TFFunctionPartition::diagnoseCopyToHost(SILValue value,
}
}

/// Emit an error for invalid send/receive of opaque handles.
void TFFunctionPartition::diagnoseOpaqueHandleCopy(SILValue value,
SILInstruction *user) {
assert(!TFSendRecvOpaqueHandle);
assert(isOpaqueHandle(value->getType()) &&
"Shouldn't emit an error for opaque handle copy when the value is not "
"an opaque handle");
auto &ctx = value->getFunction()->getASTContext();
diagnose(ctx, getUserSourceLocation(value).getSourceLoc(),
diag::tfop_value_no_send_receive);
diagnose(ctx, getUserSourceLocation(user).getSourceLoc(),
diag::tf_value_used_here);
}

/// Some instruction in the specified block needs to be split out to the
/// accelerator, so we mark it (and its control dependencies) as to-be-moved
/// over.
Expand Down Expand Up @@ -3718,19 +3684,6 @@ void TFFunctionPartition::balanceRetainReleaseCount(SILValue oldResult,

void TFFunctionPartition::insertReplacementGraphOp(
ArrayRef<SILValue> resultValues) {
// Sanity check that all result values are tensor handles. Note SIL
// accelerator functions under the "tensorflow" convention can also return
// variant and resource tensors (in addition to tensor handles), but such
// functions will not generate all host-side code, and thus this method will
// not be called.
assert(TFSendRecvOpaqueHandle ||
llvm::all_of(resultValues,
[](SILValue resultValue) {
return isTensorHandle(resultValue->getType());
}) &&
"Cannot return a non-TensorHandle value to host in the TF program "
"-- should this function use tensorflow convention?");

auto &ctx = hostFn.getASTContext();
auto loc = hostFn.getLocation();

Expand Down Expand Up @@ -3775,17 +3728,6 @@ void TFFunctionPartition::insertReplacementGraphOp(

void TFFunctionPartition::insertTensorComputationStartEndTerminate(
ArrayRef<SILValue> resultValues) {
// Sanity check that all result values are tensor handles. Note SIL
// accelerator functions under the "tensorflow" convention can also return
// variant and resource tensors (in addition to tensor handles), but such
// functions will not generate all host-side code, and thus this method will
// not be called.
for (auto resultValue : resultValues) {
assert(TFSendRecvOpaqueHandle || isTensorHandle(resultValue->getType()) &&
"Cannot return a non-TensorHandle value to host in the TF program "
"-- should this function use tensorflow convention?");
}

auto &ctx = hostFn.getASTContext();
auto loc = hostFn.getLocation();

Expand Down Expand Up @@ -3925,8 +3867,7 @@ void TFFunctionPartition::insertTensorComputationStartEndTerminate(
// closed over. If it is a TensorHandle<T>, load the CTensorHandle out of
// it. If it is a scalar, then we need to box the scalar in a
// CTensorHandle.
if ((TFSendRecvOpaqueHandle &&
isTensorFlowValue(tensorValue->getType().getASTType())) ||
if (isTensorFlowValue(tensorValue->getType().getASTType()) ||
isTensorHandle(tensorValue->getType().getASTType())) {
// Upcast to _AnyTensorHandle.
tensorValue = B.createUpcast(loc, tensorValue, anyTensorHandleSILTy);
Expand Down Expand Up @@ -4209,15 +4150,6 @@ bool TFFunctionPartition::partition(bool isTest) {
continue;
}

// If it's an opaque handle such as VariantHandle or ResourceHandle,
// it cannot be a result except when it's being returned in an
// accelerator-only function.
if (!TFSendRecvOpaqueHandle && isOpaqueHandle(result->getType()) &&
!(isAcceleratorOnly(hostFn) && isReturning(user))) {
diagnoseOpaqueHandleCopy(result, user);
return true;
}

// Remember if the instruction has any use. If not, then it never
// needs to be sent or returned.
hasAnyUse = true;
Expand Down
3 changes: 1 addition & 2 deletions test/TensorFlowRuntime/dataset_global.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// TODO: Revert to %target-run-simple-swift once we complete send/recv support for resource/variant tensors.
// RUN: %target-run-send-recv-handle-swift %swift-tensorflow-test-run-extra-options
// RUN: %target-run-simple-swift %swift-tensorflow-test-run-extra-options
// RUN: %target-run-dynamic-compilation-swift %swift-tensorflow-test-run-extra-options
// REQUIRES: executable_test
// REQUIRES: swift_test_mode_optimize
Expand Down
9 changes: 0 additions & 9 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,6 @@ def use_interpreter_for_simple_runs():
# tests to the new code path (when the flag is true).
config.target_run_simple_swift_use_device_stack = (
"%s %%s -Xllvm -tf-use-device-stack" % (target_run_base))
config.target_run_simple_swift_send_recv_handle = (
"%s %%s -Xllvm -tf-send-recv-opaque-handle" % (target_run_base))
config.target_run_swift_dynamic_compilation = (
"%s %%s -Xllvm -tf-dynamic-compilation" % (target_run_base))
config.target_run_simple_swiftgyb = (
Expand Down Expand Up @@ -1144,12 +1142,6 @@ if not getattr(config, 'target_run_simple_swift', None):
'%s %%t/a.out &&'
'%s %%t/a.out'
% (config.target_build_swift, mcp_opt, swift_tensorflow_extra_options, config.target_codesign, config.target_run))
config.target_run_simple_swift_send_recv_handle = (
'%%empty-directory(%%t) && '
'%s %s %%s -Xllvm -tf-send-recv-opaque-handle -o %%t/a.out -module-name main %s && '
'%s %%t/a.out &&'
'%s %%t/a.out'
% (config.target_build_swift, mcp_opt, swift_tensorflow_extra_options, config.target_codesign, config.target_run))
config.target_run_swift_dynamic_compilation = (
'%%empty-directory(%%t) && '
'%s %s %%s -Xllvm -tf-dynamic-compilation -DTF_DYNAMIC_COMPILATION -o %%t/a.out -module-name main %s && '
Expand Down Expand Up @@ -1306,7 +1298,6 @@ config.substitutions.append(('%target-run-simple-swift-swift3', config.target_ru
config.substitutions.append(('%target-run-simple-swift', config.target_run_simple_swift))
# SWIFT_ENABLE_TENSORFLOW
config.substitutions.append(('%target-run-use-device-stack-swift', config.target_run_simple_swift_use_device_stack))
config.substitutions.append(('%target-run-send-recv-handle-swift', config.target_run_simple_swift_send_recv_handle))
config.substitutions.append(('%target-run-dynamic-compilation-swift', config.target_run_swift_dynamic_compilation))
config.substitutions.append(('%target-run-simple-no-vjp-swift', config.target_run_simple_no_vjp_swift))
config.substitutions.append(('%target-run-simple-parse-stdlib-swift', config.target_run_simple_parse_stdlib_swift))
Expand Down